From 34e2c1b601bb17df578921265e7cbd9dce9c619b Mon Sep 17 00:00:00 2001 From: matthewgraca Date: Wed, 18 Jan 2023 14:22:52 -0800 Subject: [PATCH] following practice of pinning cmake where conda is used --- conda/debugging_pytorch.sh | 2 +- wheel/build_wheel.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conda/debugging_pytorch.sh b/conda/debugging_pytorch.sh index e79567acb..c017ebb2c 100644 --- a/conda/debugging_pytorch.sh +++ b/conda/debugging_pytorch.sh @@ -14,7 +14,7 @@ export USE_CUDA_STATIC_LINK=1 . ./switch_cuda_version.sh 9.0 -conda install -y cmake numpy=1.17 setuptools pyyaml cffi mkl=2018 mkl-include typing_extension ninja magma-cuda80 -c pytorch +conda install -y cmake=3.22.* numpy=1.17 setuptools pyyaml cffi mkl=2018 mkl-include typing_extension ninja magma-cuda80 -c pytorch export CMAKE_PREFIX_PATH="$(dirname $(which conda))/../" git clone https://github.com/pytorch/pytorch -b nightly2 --recursive diff --git a/wheel/build_wheel.sh b/wheel/build_wheel.sh index b41c5c11d..b2b782c02 100755 --- a/wheel/build_wheel.sh +++ b/wheel/build_wheel.sh @@ -167,7 +167,7 @@ tmp_env_name="wheel_py$python_nodot" conda create ${EXTRA_CONDA_INSTALL_FLAGS} -yn "$tmp_env_name" python="$desired_python" source activate "$tmp_env_name" -retry conda install ${EXTRA_CONDA_INSTALL_FLAGS} -yq cmake "numpy${NUMPY_PINNED_VERSION}" nomkl "setuptools${SETUPTOOLS_PINNED_VERSION}" "pyyaml${PYYAML_PINNED_VERSION}" cffi typing_extensions ninja requests +retry conda install ${EXTRA_CONDA_INSTALL_FLAGS} -yq cmake=3.22.* "numpy${NUMPY_PINNED_VERSION}" nomkl "setuptools${SETUPTOOLS_PINNED_VERSION}" "pyyaml${PYYAML_PINNED_VERSION}" cffi typing_extensions ninja requests retry conda install ${EXTRA_CONDA_INSTALL_FLAGS} -yq mkl-include==2022.2.1 mkl-static==2022.2.1 -c intel retry pip install -qr "${pytorch_rootdir}/requirements.txt" || true