Skip to content

Commit 2244bd6

Browse files
authored
Remove custom PyTorch build dependency logic on 3.11 (#1699)
1 parent 1d444d3 commit 2244bd6

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

run_tests.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ if [[ "$cuda_ver" != 'cpu' ]]; then
142142
fi
143143
fi
144144

145-
# Check that OpenBlas is not linked to on Macs
145+
# Check that OpenBlas is not linked to on MacOS
146146
if [[ "$(uname)" == 'Darwin' ]]; then
147147
echo "Checking the OpenBLAS is not linked to"
148148
all_dylibs=($(find "$(python -c "import site; print(site.getsitepackages()[0])")"/torch -name '*.dylib'))
@@ -153,6 +153,9 @@ if [[ "$(uname)" == 'Darwin' ]]; then
153153
exit 1
154154
fi
155155
done
156+
157+
echo "Checking that OpenMP is available"
158+
python -c "import torch; exit(0 if torch.backends.openmp.is_available() else 1)"
156159
fi
157160

158161
popd

wheel/build_wheel.sh

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -182,11 +182,8 @@ tmp_env_name="wheel_py$python_nodot"
182182
conda create ${EXTRA_CONDA_INSTALL_FLAGS} -yn "$tmp_env_name" python="$desired_python"
183183
source activate "$tmp_env_name"
184184

185-
if [[ "$desired_python" == "3.11" ]]; then
186-
retry pip install -q "numpy${NUMPY_PINNED_VERSION}" "setuptools${SETUPTOOLS_PINNED_VERSION}" "pyyaml${PYYAML_PINNED_VERSION}" typing_extensions requests
187-
else
188-
retry conda install ${EXTRA_CONDA_INSTALL_FLAGS} -yq "numpy${NUMPY_PINNED_VERSION}" nomkl "setuptools${SETUPTOOLS_PINNED_VERSION}" "pyyaml${PYYAML_PINNED_VERSION}" typing_extensions requests
189-
fi
185+
retry conda install ${EXTRA_CONDA_INSTALL_FLAGS} -yq "numpy${NUMPY_PINNED_VERSION}" nomkl "setuptools${SETUPTOOLS_PINNED_VERSION}" "pyyaml${PYYAML_PINNED_VERSION}" typing_extensions requests
186+
190187
if [[ "$(uname -m)" == "arm64" ]]; then
191188
retry conda install ${EXTRA_CONDA_INSTALL_FLAGS} -yq cmake ninja
192189
else

0 commit comments

Comments
 (0)