Merge pull request #700 from mv1388/upgrade_pytorch_version_to_1_12

Upgrade PyTorch version to 1.12

bin/AWS/create_instance.sh

@@ -130,11 +130,11 @@ if [ "$key_path" == "" ] ; then
 fi
 
 if [ "$DL_framework" == "TF" ]; then
-    py_env="tensorflow_p36"
+    py_env="tensorflow"
 elif [ "$DL_framework" == "pytorch" ]; then
-    py_env="pytorch_latest_p36"
+    py_env="pytorch"
 else
-    py_env="pytorch_latest_p36"
+    py_env="pytorch"
 fi
 
 if [[ "$instance_type" != "" ]]; then

bin/AWS/prepare_instance.sh

@@ -125,11 +125,11 @@ fi
 
 
 if [ "$DL_framework" == "TF" ]; then
-    py_env="tensorflow_p36"
+    py_env="tensorflow"
 elif [ "$DL_framework" == "pytorch" ]; then
-    py_env="pytorch_latest_p36"
+    py_env="pytorch"
 else
-    py_env="pytorch_latest_p36"
+    py_env="pytorch"
 fi
 
 if [ "$aws_region" == "eu-central-1" ]; then

bin/AWS/submit_job.sh

@@ -165,11 +165,11 @@ if [ "$key_path" == "" ] || [ "$local_project_path" == "" ]; then
 fi
 
 if [ "$DL_framework" == "TF" ]; then
-    py_env="tensorflow_p36"
+    py_env="tensorflow"
 elif [ "$DL_framework" == "pytorch" ]; then
-    py_env="pytorch_latest_p36"
+    py_env="pytorch"
 else
-    py_env="pytorch_latest_p36"
+    py_env="pytorch"
 fi
 
 terminate_setting=""

bin/AWS/test_core_pytorch_compare.sh

@@ -48,7 +48,7 @@ key_path=$(jq -r '.key_path' configs/my_config.json)
 instance_config="default_config.json"
 instance_type=
 username="ubuntu"
-py_env="pytorch_latest_p36"
+py_env="pytorch"
 ssh_at_start=true
 spot_instance=true
 aws_region="eu-west-1"
@@ -160,7 +160,7 @@ scp -i $key_path ../../requirements.txt $username@$ec2_instance_address:~/packag
 #########################################################
 echo "Running the comparison tests"
 ssh -i $key_path $username@$ec2_instance_address \
-    "source activate $py_env ; tmux new-session -d -s 'training' 'export AWS_DEFAULT_REGION=$aws_region ; cd package_test ; pip install pytest seaborn==0.9.0 ; pip install -r requirements.txt ; pip install torchtext==0.7 torchvision>=0.9.1 ; pytest $pytest_dir -s ; aws s3 cp $logging_path s3://aitoolbox-testing/core_pytorch_comparisson_testing/$logging_filename ; aws ec2 terminate-instances --instance-ids $instance_id' \; pipe-pane 'cat > $logging_path'"
+    "source activate $py_env ; tmux new-session -d -s 'training' 'export AWS_DEFAULT_REGION=$aws_region ; cd package_test ; pip install pytest seaborn==0.9.0 ; pip install -r requirements.txt ; python -m pytest $pytest_dir -s ; aws s3 cp $logging_path s3://aitoolbox-testing/core_pytorch_comparisson_testing/$logging_filename ; aws ec2 terminate-instances --instance-ids $instance_id' \; pipe-pane 'cat > $logging_path'"
 
 echo "Instance IP: $ec2_instance_address"
 

bin/AWS/update_experiments_on_AWS.sh

@@ -30,7 +30,7 @@ experiment_script_file="aws_run_experiments_project.sh"
 aws_project_root_path=~/project
 
 username="ubuntu"
-py_env="pytorch_latest_p36"
+py_env="pytorch"
 
 
 while [[ $# -gt 0 ]]; do

bin/AWS/update_package_on_AWS.sh

@@ -70,11 +70,11 @@ fi
 
 
 if [ $DL_framework == "TF" ]; then
-    py_env="tensorflow_p36"
+    py_env="tensorflow"
 elif [ $DL_framework == "pytorch" ]; then
-    py_env="pytorch_latest_p36"
+    py_env="pytorch"
 else
-    py_env="pytorch_latest_p36"
+    py_env="pytorch"
 fi
 
 

requirements.txt

@@ -1,4 +1,4 @@
-torch
+torch>=1.12.0
 torchvision
 torchtext
 pytorch-nlp

setup.py

@@ -18,7 +18,7 @@
     packages=find_packages(exclude=['tests', 'tests_gpu', 'examples', 'deprecated']),
 
     install_requires=[
-        'torch',
+        'torch>=1.12.0',
         'torchvision',
         'torchtext',
         'pytorch-nlp',