diff options
Diffstat (limited to 'experiments/handoff_selectors_to_full_crossover.sh')
| -rwxr-xr-x | experiments/handoff_selectors_to_full_crossover.sh | 57 |
1 files changed, 19 insertions, 38 deletions
diff --git a/experiments/handoff_selectors_to_full_crossover.sh b/experiments/handoff_selectors_to_full_crossover.sh index 04d1b5d..61d0f07 100755 --- a/experiments/handoff_selectors_to_full_crossover.sh +++ b/experiments/handoff_selectors_to_full_crossover.sh @@ -18,6 +18,8 @@ resnet_r2_root="/home/yurenh2/sdil-resnet-r2" transformer_t2_root="/home/yurenh2/sdil-transformer-t2" plain_root="/scratch/yurenh2/sdil-crossover/dualprop_vgg16" python_bin="/home/yurenh2/miniconda3/envs/ep_pascal/bin/python3" +plain_python="/scratch/yurenh2/venvs/dualprop/bin/python" +validator="/home/yurenh2/sdil/experiments/validate_crossover_artifact.py" gpu5_uuid="GPU-f4aed756-228e-7522-94e7-fb543c02cc74" gpu7_uuid="GPU-df3d5933-c3e9-9ea1-d595-9d2a3b68c14b" @@ -73,20 +75,12 @@ wait_for_file() { validate_selector() { local path="$1" - local stage="$2" - local count="$3" - jq -e --arg stage "$stage" --argjson count "$count" ' - .gate == "pass" and - .stage == $stage and - .num_expected_records == $count and - .num_audited_records == $count and - .missing_experiments == [] and - (.selected | length) == 9 and - .test_policy == "none" - ' "$path" >/dev/null + local kind="$2" + "$python_bin" "$validator" --path "$path" --kind "$kind" } test -x "$python_bin" +test -x "$plain_python" test "$(gpu_uuid 5)" = "$gpu5_uuid" test "$(gpu_uuid 7)" = "$gpu7_uuid" require_source "$resnet_p1_root" "$expected_p1_commit" @@ -99,9 +93,9 @@ transformer_p1_selector="$transformer_p1_root/results/transformer_crossover/p1_s echo "waiting for both audited P1 selectors at $(date --iso-8601=seconds)" wait_for_file "$resnet_p1_selector" wait_for_file "$transformer_p1_selector" -validate_selector "$resnet_p1_selector" "resnet_crossover_p1" 19 +validate_selector "$resnet_p1_selector" "resnet_p1_selector" validate_selector \ - "$transformer_p1_selector" "transformer_crossover_p1" 27 + "$transformer_p1_selector" "transformer_p1_selector" resnet_r2_selector="$resnet_r2_root/results/resnet_crossover/p1_selector.json" transformer_t2_selector="$transformer_t2_root/results/transformer_crossover/p1_selector.json" @@ -119,9 +113,9 @@ mkdir -p "$(dirname "$transformer_t2_selector")" "$python_bin" experiments/analyze_transformer_crossover_p1.py \ --out "$transformer_t2_selector" ) >"$transformer_t2_root/results/transformer_crossover/p1_import.log" 2>&1 -validate_selector "$resnet_r2_selector" "resnet_crossover_p1" 19 +validate_selector "$resnet_r2_selector" "resnet_p1_selector" validate_selector \ - "$transformer_t2_selector" "transformer_crossover_p1" 27 + "$transformer_t2_selector" "transformer_p1_selector" git -C "$resnet_r2_root" add -f \ results/resnet_crossover/p1_selector.json git -C "$resnet_r2_root" commit -m \ @@ -160,13 +154,9 @@ require_source "$resnet_r2_root" "$resnet_r2_commit" "$python_bin" experiments/analyze_resnet_crossover_r2.py \ --out results/resnet_crossover/r2_audit.json ) >"$resnet_r2_root/results/resnet_crossover/r2_audit.log" 2>&1 -jq -e ' - .audit_status == "passed" and - .complete_grid == true and - .failure_retaining == true and - .num_audited_cells == 27 and - .test_policy == "none" -' "$resnet_r2_root/results/resnet_crossover/r2_audit.json" >/dev/null +"$python_bin" "$validator" \ + --path "$resnet_r2_root/results/resnet_crossover/r2_audit.json" \ + --kind resnet_r2_audit git -C "$resnet_r2_root" add -f results/resnet_crossover git -C "$resnet_r2_root" commit -m \ "results: record complete ResNet crossover" @@ -197,19 +187,14 @@ require_source "$transformer_t2_root" "$transformer_t2_commit" "$python_bin" experiments/analyze_transformer_crossover_t2.py \ --out results/transformer_crossover/t2_audit.json ) >"$transformer_t2_root/results/transformer_crossover/t2_audit.log" 2>&1 -jq -e ' - .audit_status == "passed" and - .complete_grid == true and - .failure_retaining == true and - .num_audited_cells == 27 and - .test_policy == "none" -' "$transformer_t2_root/results/transformer_crossover/t2_audit.json" \ - >/dev/null +"$python_bin" "$validator" \ + --path "$transformer_t2_root/results/transformer_crossover/t2_audit.json" \ + --kind transformer_t2_audit plain_audit="$transformer_t2_root/results/plain_cnn_p2_audit.json" ( cd "$plain_root" - "$python_bin" analyze_p2.py --output "$plain_audit" + "$plain_python" analyze_p2.py --output "$plain_audit" ) "$python_bin" "$transformer_t2_root/experiments/analyze_crossover_81.py" \ --plain "$plain_audit" \ @@ -217,13 +202,9 @@ plain_audit="$transformer_t2_root/results/plain_cnn_p2_audit.json" --transformer \ "$transformer_t2_root/results/transformer_crossover/t2_audit.json" \ --out "$transformer_t2_root/results/crossover_81_audit.json" -jq -e ' - .audit_status == "passed" and - .complete_grid == true and - .failure_retaining == true and - .num_audited_cells == 81 and - .test_policy == "none" -' "$transformer_t2_root/results/crossover_81_audit.json" >/dev/null +"$python_bin" "$validator" \ + --path "$transformer_t2_root/results/crossover_81_audit.json" \ + --kind crossover_81_audit git -C "$transformer_t2_root" add -f \ results/transformer_crossover \ results/plain_cnn_p2_audit.json \ |