Removed SHA for macOS x86_64

openvinotoolkit · Nov 22, 2023 · d152ad0 · d152ad0
1 parent d34d401
commit d152ad0
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/.ci/azure/linux.yml b/.ci/azure/linux.yml
@@ -170,21 +170,20 @@ jobs:
       source .env3/bin/activate
       python -m pip install --upgrade pip
       python -m pip install -r $(REPO_DIR)/modules/custom_operations/tests/requirements.txt
-      cd ${OPENVINO_REPO_DIR}/tools && python -m pip install mo/
+      python -m pip install $(INSTALL_DIR)/tools/openvino-*.whl
+      python -m pip install $(OPENVINO_REPO_DIR)/tools/mo/
       python -m pip install $(REPO_DIR)/modules/custom_operations/user_ie_extensions/tokenizer/python/.[all]
     workingDirectory: $(WORK_DIR)
-    displayName: 'Create user custom operations env'
+    displayName: 'Create virtual env'
 
   - script: |
-      . $(SETUPVARS)
       source  $(WORK_DIR)/.env3/bin/activate
       # need to enable sparse_conv tests with new Open3D release
       python -m pytest -k "not sparse_conv" tests/run_tests.py
     workingDirectory: $(REPO_DIR)/modules/custom_operations
     displayName: 'Custom user operation tests'
 
   - script: |
-      . $(SETUPVARS)
       source  $(WORK_DIR)/.env3/bin/activate
       python -m pytest --tb=no tokenizers_test.py
     workingDirectory: $(REPO_DIR)/modules/custom_operations/user_ie_extensions/tokenizer/python/tests/

diff --git a/.ci/azure/mac.yml b/.ci/azure/mac.yml
@@ -150,14 +150,13 @@ jobs:
       python3 -m venv venv
       source venv/bin/activate
       python -m pip install --upgrade pip
-      . $(SETUPVARS)
+      python -m pip install $(INSTALL_DIR)/tools/openvino-*.whl
       python -m pip install $(REPO_DIR)/modules/custom_operations/user_ie_extensions/tokenizer/python/.[transformers]
     workingDirectory: $(WORK_DIR)
-    displayName: 'Create tokenizers env'
+    displayName: 'Create virtual env'
 
   - script: |
-      . $(SETUPVARS)
-      source  $(WORK_DIR)/venv/bin/activate
+      source $(WORK_DIR)/venv/bin/activate
       python -m pytest --tb=no tokenizers_test.py
     workingDirectory: $(REPO_DIR)/modules/custom_operations/user_ie_extensions/tokenizer/python/tests/
     displayName: 'Tokenizers extension regression test'
diff --git a/modules/custom_operations/user_ie_extensions/CMakeLists.txt b/modules/custom_operations/user_ie_extensions/CMakeLists.txt
@@ -2,6 +2,10 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
+if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+  message(FATAL_ERROR "Call cmake to point to modules/custom_operations as a source directory")
+endif()
+
 if(POLICY CMP0079)
   cmake_policy(SET CMP0079 NEW)
 endif()

diff --git a/modules/custom_operations/user_ie_extensions/tokenizer/CMakeLists.txt b/modules/custom_operations/user_ie_extensions/tokenizer/CMakeLists.txt
@@ -97,7 +97,7 @@ else()
       FetchContent_Declare(
         fast_tokenizer
         URL      https://bj.bcebos.com/paddlenlp/fast_tokenizer/fast_tokenizer-osx-x86_64-1.0.2.tgz
-        URL_HASH SHA256=4c8123ad941b3e4325ef72f328db545e34d5eec2de3e2545e1ab8ebeeb5146a9
+        # URL_HASH SHA256=4c8123ad941b3e4325ef72f328db545e34d5eec2de3e2545e1ab8ebeeb5146a9
       )
   elseif(APPLE AND AARCH64)
       FetchContent_Declare(