Merge pull request #711 from mv1388/fix_aws_instance_termination

Switch to source-ing from executing the prepare_instance.sh script

bin/AWS/prepare_instance.sh

@@ -156,14 +156,12 @@ export LANG=en_US.UTF-8
 export LC_ALL=en_US.UTF-8
 export AWS_DEFAULT_REGION=$aws_region
 
-cd project
-
 source activate $py_env
 
 pip install 'typer[all]'
 
 if [ $pypi_install == false ]; then
-  pip install aitoolbox-$AIToolbox_version.tar.gz
+  pip install ~/project/aitoolbox-$AIToolbox_version.tar.gz
 else
   pip install aitoolbox==$AIToolbox_version
 fi

bin/AWS/submit_job.sh

@@ -237,11 +237,11 @@ printf "\n========================================================\n"
 echo "Running the job"
 if [ "$run_with_scheduler" == true ]; then
   ssh -i $key_path $username@$ec2_instance_address \
-      "source activate $py_env ; tmux new-session -d -s 'training' './finish_prepare_instance.sh ; cd project ; python ~/training_job_scheduler.py add-job --experiment-script $experiment_script_file ; python ~/training_job_scheduler.py run $terminate_setting $log_upload_setting --aws-region $aws_region' \; pipe-pane 'cat > $logging_path'"
+      "source activate $py_env ; tmux new-session -d -s 'training' 'source finish_prepare_instance.sh ; cd project ; python ~/training_job_scheduler.py add-job --experiment-script $experiment_script_file ; python ~/training_job_scheduler.py run $terminate_setting $log_upload_setting --aws-region $aws_region' \; pipe-pane 'cat > $logging_path'"
 
 else
   ssh -i $key_path $username@$ec2_instance_address \
-      "source activate $py_env ; tmux new-session -d -s 'training' './finish_prepare_instance.sh ; cd project ; ./run_experiment.sh $terminate_setting --experiment-script $experiment_script_file $log_upload_setting --cleanup-script --aws-region $aws_region' \; pipe-pane 'cat > $logging_path'"
+      "source activate $py_env ; tmux new-session -d -s 'training' 'source finish_prepare_instance.sh ; cd project ; ./run_experiment.sh $terminate_setting --experiment-script $experiment_script_file $log_upload_setting --cleanup-script --aws-region $aws_region' \; pipe-pane 'cat > $logging_path'"
 fi
 
 echo "Instance IP: $ec2_instance_address"

bin/AWS/test_core_pytorch_compare.sh

@@ -161,7 +161,7 @@ scp -i $key_path -r ../../tests_gpu $username@$ec2_instance_address:~/package_te
 scp -i $key_path ../../requirements.txt $username@$ec2_instance_address:~/package_test
 
 terminate_setting=""
-if [ "$debug_mode" == true ]; then
+if [ "$debug_mode" == false ]; then
   terminate_setting="aws ec2 terminate-instances --instance-ids $instance_id"
 fi