OPICS Eval 7

deploy_files/cora/ray_script.sh

@@ -17,8 +17,8 @@ echo Starting Evaluation for CORA:
 
 # Adjust for where they hardcoded the scene file to be read from, might be different next collab/evaluation run
 echo "Copy Scene Files:"
-mkdir -p /home/ubuntu/scenes/evaluation_6
-cd /home/ubuntu/scenes/evaluation_6 || exit
+mkdir -p /home/ubuntu/scenes/evaluation_7
+cd /home/ubuntu/scenes/evaluation_7 || exit
 rm ./*
 cp "$scene_file" .
 echo $(basename "$scene_file")

deploy_files/opics/ray_script.sh

@@ -4,15 +4,19 @@ set -m
 # This is what the "main_optics" command does (from the instructions TA1 gave us).
 echo "OPICS Pipeline: Running TA1 environment setup..."
 cd /home/ubuntu/ || exit
-sudo nvidia-xconfig --use-display-device=None --virtual=600x400 --output-xconfig=/etc/X11/xorg.conf --busid=PCI:0:30:0
-export OUR_XPID=2356
-export DISPLAY=:0
+sudo nvidia-xconfig --use-display-device=Device0 --virtual=600x400 --output-xconfig=/etc/X11/xorg.conf --busid=PCI:0:30:0
+export OUR_XPID=
+export DISPLAY=:1
 export OPTICS_HOME=~/main_optics
 export PYTHONPATH=$OPTICS_HOME:$OPTICS_HOME/opics_common
 export OPTICS_DATASTORE=ec2b
 cd $OPTICS_HOME || exit
 cd scripts/ || exit
 
+# Start the X Server
+# (Note that OPICS sets the DISPLAY to :1 -- Do NOT call start_x_server.sh)
+sudo /usr/bin/Xorg :1 1>startx-out.txt 2>startx-err.txt &
+
 # Check passed mcs_config and scene file
 # shellcheck source=/dev/null
 source /home/ubuntu/check_passed_variables.sh
@@ -22,6 +26,7 @@ echo "OPICS Pipeline: Running OPICS with MCS config file $mcs_configfile and eva
 
 echo "OPICS Pipeline: Removing previous scene history files in $eval_dir/SCENE_HISTORY/"
 rm -f "$eval_dir"/SCENE_HISTORY/*
+mkdir -p "$eval_dir"/SCENE_HISTORY/
 
 # shellcheck disable=SC2207
 CONTAINER_DIRS=($(ls /home/ubuntu/test__* -d))
@@ -30,11 +35,8 @@ for CONTAINER_DIR in "${CONTAINER_DIRS[@]}"; do
     rm -f "$CONTAINER_DIR"/scripts/SCENE_HISTORY/*
 done
 
-# Start X
-source /home/ubuntu/start_x_server.sh
-
 export MCS_CONFIG_FILE_PATH=$mcs_configfile
-python opics_eval6_run_scene.py --scene "$scene_file"
+python opics_eval7_run_scene.py --scene "$scene_file"
 unset MCS_CONFIG_FILE_PATH
 
 DEBUG=true

mako/eval-7-cora.yaml

@@ -0,0 +1,6 @@
+base:
+  varset: ['cora']
+eval-groups:
+  - metadata: ['level2']
+    dirs: ['/home/ubuntu/mcs/eval_7_validation/']
+    #dirs: ['/home/ple/mcs/eval_6/eval_6_validation_small/']

mako/templates/ray_template_aws.yaml

@@ -58,6 +58,8 @@ setup_commands:
   - python3 -m pip install -U "ray[default]" boto3
   - python3 -m pip install -U "ray[default]"==2.4.0
   - python3 -m pip install -U gpustat==1.0.0
+  - python3 -m pip install boto3==1.18.9
+  - python3 -m pip install botocore==1.21.9
   ${additional_setup_commands}
 
 # Command to start ray on the head node. You don't need to change this.

mako/variables/opics.yaml

@@ -2,6 +2,4 @@ cluster: "opics"
 filePrefix: "opics"
 team: "opics"
 region: us-east-1
-ami: ami-0c3e21efcd9cc4ee3 #opics-eval-6-with-nvidia-hold-patch, us-east-1
-# region: us-east-2
-# ami: ami-0446e2290a501208f #opics-eval-6-with-nvidia-hold-patch, us-east-2
+ami: ami-0a220c7e0e7cfa70d # opics-eval-7-validation-1