From d67448d7aca3a594fcfa2e5ee1089e0c126c2594 Mon Sep 17 00:00:00 2001 From: Sai Parthasarathy Miduthuri Date: Wed, 2 Jun 2021 10:08:38 -0700 Subject: [PATCH 1/4] [huggingface_pytorch] Safety check on PT 1.6 --- huggingface/pytorch/buildspec.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/huggingface/pytorch/buildspec.yml b/huggingface/pytorch/buildspec.yml index 32f7ae511e6c..01c70e409bda 100644 --- a/huggingface/pytorch/buildspec.yml +++ b/huggingface/pytorch/buildspec.yml @@ -2,8 +2,8 @@ account_id: &ACCOUNT_ID region: ®ION base_framework: &BASE_FRAMEWORK pytorch framework: &FRAMEWORK !join [ "huggingface_", *BASE_FRAMEWORK] -version: &VERSION 1.7.1 -short_version: &SHORT_VERSION 1.7 +version: &VERSION 1.6.0 +short_version: &SHORT_VERSION 1.6 repository_info: training_repository: &TRAINING_REPOSITORY @@ -27,5 +27,5 @@ images: datasets_version: &DATASETS_VERSION 1.6.2 tag: !join [ *VERSION, '-', 'transformers', *TRANSFORMERS_VERSION, '-', *DEVICE_TYPE, '-', *TAG_PYTHON_VERSION, '-', *CUDA_VERSION, '-', *OS_VERSION ] - docker_file: !join [ docker/, *SHORT_VERSION, /, *DOCKER_PYTHON_VERSION, /, + docker_file: !join [ docker/, *SHORT_VERSION, /, *DOCKER_PYTHON_VERSION, /, *CUDA_VERSION, /Dockerfile., *DEVICE_TYPE ] From 4629c5a362bfbfcf3e7a1bcc221eb9dfe142fb76 Mon Sep 17 00:00:00 2001 From: Sai Parthasarathy Miduthuri Date: Wed, 2 Jun 2021 10:10:12 -0700 Subject: [PATCH 2/4] Disable other frameworks and datetime tags --- src/config/build_config.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/config/build_config.py b/src/config/build_config.py index 0b7e2581a102..0b0cc8b5b865 100644 --- a/src/config/build_config.py +++ b/src/config/build_config.py @@ -5,9 +5,9 @@ # Do remember to revert it back to False before merging any PR (including NEURON dedicated PR) ENABLE_NEURON_MODE = False # Frameworks for which you want to disable both builds and tests -DISABLE_FRAMEWORK_TESTS = [] +DISABLE_FRAMEWORK_TESTS = ["tensorflow", "mxnet", "pytorch", "huggingface_tensorflow"] # Disable new builds or build without datetime tag -DISABLE_DATETIME_TAG = False +DISABLE_DATETIME_TAG = True # Note: Need to build the images at least once with DISABLE_DATETIME_TAG = True # before disabling new builds or tests will fail DISABLE_NEW_BUILDS = False From bc0845ab96c0cfcaab38c07c56d3ef7e34f22f2b Mon Sep 17 00:00:00 2001 From: Sai Parthasarathy Miduthuri Date: Wed, 2 Jun 2021 10:11:41 -0700 Subject: [PATCH 3/4] Enable safety check --- test/dlc_tests/sanity/test_safety_check.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/test/dlc_tests/sanity/test_safety_check.py b/test/dlc_tests/sanity/test_safety_check.py index ce36d214ab1c..cb3ad71fa9ed 100644 --- a/test/dlc_tests/sanity/test_safety_check.py +++ b/test/dlc_tests/sanity/test_safety_check.py @@ -128,10 +128,6 @@ def _get_latest_package_version(package): @pytest.mark.model("N/A") @pytest.mark.canary("Run safety tests regularly on production images") @pytest.mark.skipif(not is_dlc_cicd_context(), reason="Skipping test because it is not running in dlc cicd infra") -@pytest.mark.skipif(not (is_mainline_context() or (is_canary_context() and is_time_for_canary_safety_scan())), - reason="Skipping the test to decrease the number of calls to the Safety Check DB. " - "Test will be executed in the 'mainline' pipeline and canaries pipeline." - ) def test_safety(image): """ Runs safety check on a container with the capability to ignore safety issues that cannot be fixed, and only raise From 4b133ab905c7cbd5247884c8137b09caa9914ca7 Mon Sep 17 00:00:00 2001 From: Sai Parthasarathy Miduthuri Date: Fri, 4 Jun 2021 11:50:13 -0700 Subject: [PATCH 4/4] Revert changes --- src/config/build_config.py | 4 ++-- test/dlc_tests/sanity/test_safety_check.py | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/config/build_config.py b/src/config/build_config.py index 0b0cc8b5b865..0b7e2581a102 100644 --- a/src/config/build_config.py +++ b/src/config/build_config.py @@ -5,9 +5,9 @@ # Do remember to revert it back to False before merging any PR (including NEURON dedicated PR) ENABLE_NEURON_MODE = False # Frameworks for which you want to disable both builds and tests -DISABLE_FRAMEWORK_TESTS = ["tensorflow", "mxnet", "pytorch", "huggingface_tensorflow"] +DISABLE_FRAMEWORK_TESTS = [] # Disable new builds or build without datetime tag -DISABLE_DATETIME_TAG = True +DISABLE_DATETIME_TAG = False # Note: Need to build the images at least once with DISABLE_DATETIME_TAG = True # before disabling new builds or tests will fail DISABLE_NEW_BUILDS = False diff --git a/test/dlc_tests/sanity/test_safety_check.py b/test/dlc_tests/sanity/test_safety_check.py index cb3ad71fa9ed..ce36d214ab1c 100644 --- a/test/dlc_tests/sanity/test_safety_check.py +++ b/test/dlc_tests/sanity/test_safety_check.py @@ -128,6 +128,10 @@ def _get_latest_package_version(package): @pytest.mark.model("N/A") @pytest.mark.canary("Run safety tests regularly on production images") @pytest.mark.skipif(not is_dlc_cicd_context(), reason="Skipping test because it is not running in dlc cicd infra") +@pytest.mark.skipif(not (is_mainline_context() or (is_canary_context() and is_time_for_canary_safety_scan())), + reason="Skipping the test to decrease the number of calls to the Safety Check DB. " + "Test will be executed in the 'mainline' pipeline and canaries pipeline." + ) def test_safety(image): """ Runs safety check on a container with the capability to ignore safety issues that cannot be fixed, and only raise