diff --git a/.github/workflows/ci-huggingface.yml b/.github/workflows/ci-huggingface.yml index a223b163e0..ed3056ad06 100644 --- a/.github/workflows/ci-huggingface.yml +++ b/.github/workflows/ci-huggingface.yml @@ -16,7 +16,7 @@ on: branches: - main - dev* - - clip_1.17_dev + # Run scheduled CI flow daily schedule: - cron: '0 8 * * 0' diff --git a/.github/workflows/ci-pytorch.yml b/.github/workflows/ci-pytorch.yml index ef231a5b1a..d162dfdcbd 100644 --- a/.github/workflows/ci-pytorch.yml +++ b/.github/workflows/ci-pytorch.yml @@ -16,7 +16,6 @@ on: branches: - main - dev* - - clip_attack # Run scheduled CI flow daily schedule: diff --git a/.github/workflows/ci-style-checks.yml b/.github/workflows/ci-style-checks.yml index 549a4de552..c8283c8b9d 100644 --- a/.github/workflows/ci-style-checks.yml +++ b/.github/workflows/ci-style-checks.yml @@ -16,7 +16,6 @@ on: branches: - main - dev* - - clip_1.17_dev # Run scheduled CI flow daily schedule: diff --git a/run_single_test.sh b/run_single_test.sh deleted file mode 100644 index 64c81b0658..0000000000 --- a/run_single_test.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/env bash - -exit_code=0 - -# Set TensorFlow logging to minimum level ERROR -export TF_CPP_MIN_LOG_LEVEL="3" - -# --------------------------------------------------------------------------------------------------------------- TESTS - -# NOTE: All the tests should be ran within this loop. All other tests are legacy tests that must be made framework -# independent to be incorporated within this loop -frameworkList=("tensorflow" "keras" "pytorch" "scikitlearn" "mxnet" "kerastf") -framework=$1 -legacy_module=$2 - -if [[ ${framework} != "legacy" ]] -then - echo "#######################################################################" - echo "############### Running tests with framework $framework ###############" - echo "#######################################################################" - - pytest --cov-report=xml --cov=art --cov-append -q -vv tests/attacks/evasion/test_multimodal_attack.py --framework=$framework --durations=0 - if [[ $? -ne 0 ]]; then exit_code=1; echo "Failed multimodal tests"; fi - -fi - -exit ${exit_code} diff --git a/run_tests.sh b/run_tests.sh index 101c8d2705..4b32ce7792 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -133,6 +133,7 @@ else "tests/estimators/regression/test_scikitlearn.py" ) declare -a defences=("tests/defences/test_adversarial_trainer.py" \ + "tests/defences/test_adversarial_trainer_madry_pgd.py" \ "tests/defences/test_class_labels.py" \ "tests/defences/test_defensive_distillation.py" \ "tests/defences/test_feature_squeezing.py" \ @@ -181,4 +182,4 @@ else done fi -exit ${exit_code} \ No newline at end of file +exit ${exit_code}