@@ -53,8 +53,8 @@ conda install numpy=1.26.4 -y
5353if [ $TRITON_RHEL -eq 1 ]; then
5454 TORCH_VERISON=" 2.17.0"
5555fi
56- conda install torch =${TORCH_VERSION} -y
57- PY312_VERSION_STRING=" Python version is 3.12, NumPy version is 1.26.4, and PyTorch version is ${TORCH_VERISON } "
56+ conda install pytorch =${TORCH_VERSION} -y
57+ PY312_VERSION_STRING=" Python version is 3.12, NumPy version is 1.26.4, and PyTorch version is ${TORCH_VERSION } "
5858conda pack -o python3.12.tar.gz
5959mkdir -p models/python_3_12/1/
6060cp ../../python_models/python_version/config.pbtxt ./models/python_3_12
122122kill_server
123123
124124set +e
125- grep " Locale is ('en_US ', 'UTF-8')" $SERVER_LOG
125+ grep " Locale is ('C ', 'UTF-8')" $SERVER_LOG
126126 if [ $? -ne 0 ]; then
127127 cat $SERVER_LOG
128128 echo -e " \n***\n*** Locale UTF-8 was not found in Triton logs. \n***"
@@ -182,10 +182,6 @@ aws s3 mb "${BUCKET_URL}"
182182BUCKET_URL=${BUCKET_URL%/ }
183183BUCKET_URL_SLASH=" ${BUCKET_URL} /"
184184
185- # Remove Python 3.7 model because it contains absolute paths and cannot be used
186- # with S3.
187- rm -rf models/python_3_7
188-
189185# Test with the bucket url as model repository
190186aws s3 cp models/ " ${BUCKET_URL_SLASH} " --recursive --include " *"
191187
205201kill_server
206202
207203set +e
208- grep " $PY36_VERSION_STRING " $SERVER_LOG
204+ grep " $PY312_VERSION_STRING " $SERVER_LOG
209205if [ $? -ne 0 ]; then
210206 cat $SERVER_LOG
211- echo -e " \n***\n*** $PY36_VERSION_STRING was not found in Triton logs. \n***"
207+ echo -e " \n***\n*** $PY312_VERSION_STRING was not found in Triton logs. \n***"
212208 RET=1
213209fi
214210set -e
@@ -217,8 +213,6 @@ set -e
217213aws s3 rm " ${BUCKET_URL_SLASH} " --recursive --include " *"
218214
219215# Test with EXECUTION_ENV_PATH outside the model directory
220- sed -i " s/TRITON_MODEL_DIRECTORY\/python_3_6_environment/TRITON_MODEL_DIRECTORY\/..\/python_3_6_environment/" models/python_3_6/config.pbtxt
221- mv models/python_3_6/python_3_6_environment.tar.gz models
222216sed -i " s/\$\$ TRITON_MODEL_DIRECTORY\/python_3_12_environment/s3:\/\/triton-bucket-${CI_JOB_ID} \/python_3_12_environment/" models/python_3_12/config.pbtxt
223217mv models/python_3_12/python_3_12_environment.tar.gz models
224218
238232kill_server
239233
240234set +e
241- for EXPECTED_VERSION_STRING in " $PY36_VERSION_STRING " " $ PY312_VERSION_STRING" ; do
235+ for EXPECTED_VERSION_STRING in " $PY312_VERSION_STRING " ; do
242236 grep " $EXPECTED_VERSION_STRING " $SERVER_LOG
243237 if [ $? -ne 0 ]; then
244238 cat $SERVER_LOG
0 commit comments