Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

Commit

Permalink
Remove forcing rpath and some unnecessary comments
Browse files Browse the repository at this point in the history
  • Loading branch information
akarbown committed Oct 11, 2021
1 parent 2db1e31 commit 1041620
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 11 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/os_x_mklbuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
- name: Test project
run: |
python3 -m pytest -n 4 --durations=50 --verbose tests/python/unittest/ -k 'not test_operator and not (test_subgraph or test_custom_op or test_external_op or test_recordimage_dataset_with_data_loader_multiworker or test_multi_worker or test_multi_worker_shape or test_multi_worker_forked_data_loader or test_multi_worker_dataloader_release_pool)' -m 'not serial'
MXNET_ENGINE_TYPE=NaiveEngine python3 -m pytest -n 4 --durations=50 --verbose tests/python/unittest/ -k 'test_operator and not (test_subgraph or test_custom_op or test_external_op or test_recordimage_dataset_with_data_loader_multiworker or test_multi_worker or test_multi_worker_shape or test_multi_worker_forked_data_loader or test_multi_worker_dataloader_release_pool)' -m 'not serial'
python3 -m pytest --durations=50 --verbose tests/python/unittest/ -k 'not (test_subgraph or test_custom_op or test_external_op or test_recordimage_dataset_with_data_loader_multiworker or test_multi_worker or test_multi_worker_shape or test_multi_worker_forked_data_loader or test_multi_worker_dataloader_release_pool)' -m 'serial'
python3 -m pytest -n 4 --durations=50 --verbose tests/python/mkl -k 'not test_bf16_operator'
python -m pytest -n 4 --durations=50 --verbose tests/python/unittest/ -k 'not test_operator and not (test_subgraph or test_custom_op or test_external_op or test_recordimage_dataset_with_data_loader_multiworker or test_multi_worker or test_multi_worker_shape or test_multi_worker_forked_data_loader or test_multi_worker_dataloader_release_pool)' -m 'not serial'
MXNET_ENGINE_TYPE=NaiveEngine python -m pytest -n 4 --durations=50 --verbose tests/python/unittest/ -k 'test_operator and not (test_subgraph or test_custom_op or test_external_op or test_recordimage_dataset_with_data_loader_multiworker or test_multi_worker or test_multi_worker_shape or test_multi_worker_forked_data_loader or test_multi_worker_dataloader_release_pool)' -m 'not serial'
python -m pytest --durations=50 --verbose tests/python/unittest/ -k 'not (test_subgraph or test_custom_op or test_external_op or test_recordimage_dataset_with_data_loader_multiworker or test_multi_worker or test_multi_worker_shape or test_multi_worker_forked_data_loader or test_multi_worker_dataloader_release_pool)' -m 'serial'
python -m pytest -n 4 --durations=50 --verbose tests/python/mkl -k 'not test_bf16_operator'
2 changes: 0 additions & 2 deletions cmake/upstream/FindBLAS.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -525,8 +525,6 @@ if(BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL "All")
get_filename_component(BLAS_mkl_MKLROOT "${BLAS_mkl_MKLROOT}" DIRECTORY)
endif()
endif()
# MXNET NOTE: This change comes form the newest file version
# https://gitlab.kitware.com/cmake/cmake/-/issues/22295
set(BLAS_mkl_LIB_PATH_SUFFIXES
"compiler/lib" "compiler/lib/${BLAS_mkl_ARCH_NAME}_${BLAS_mkl_OS_NAME}"
"compiler/lib/${BLAS_mkl_ARCH_NAME}"
Expand Down
1 change: 0 additions & 1 deletion tools/dependencies/mkl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
# under the License.

# This script downloads OneMKL
# TODO @akarbown: Get more general link to download the OneMKL (instead of the generated one)
set -ex
export INTEL_MKL="2021.3.0"
if [[ (! -e /opt/intel/oneapi/mkl/) ]]; then
Expand Down
2 changes: 1 addition & 1 deletion tools/dependencies/numpy_mkl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,4 @@ if [[ $? -eq 0 ]] && [[ -e /opt/intel/oneapi/mkl/ ]] && [[ ! -e ~/.numpy-site.cf
# reinstall numpy to use MKL BLAS
pip3 install numpy==1.19.5 --no-binary numpy --force-reinstall --no-cache-dir
fi
set -e
set -e
3 changes: 0 additions & 3 deletions tools/staticbuild/build_lib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,6 @@ cmake -GNinja -C $cmake_config \
-DCMAKE_OSX_DEPLOYMENT_TARGET=10.13 \
..
ninja
if [[ ! $PLATFORM == 'darwin' ]] && [[ $BLAS == 'mkl' ]]; then
patchelf --set-rpath "/opt/intel/oneapi/mkl/${INTEL_MKL}/lib/intel64/:\$ORIGIN" --force-rpath libmxnet.so
fi
cd -

# Move to lib
Expand Down

0 comments on commit 1041620

Please sign in to comment.