From 25b36d9446cd369b2997c65befcf96563711094e Mon Sep 17 00:00:00 2001 From: atalman Date: Wed, 1 Mar 2023 06:49:58 -0800 Subject: [PATCH 1/3] Use python 3.9 conda environment --- .circleci/config.yml | 4 ++++ .circleci/config.yml.in | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index b2193928b1e..6c8076f28e3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -995,6 +995,8 @@ jobs: command: | set -ex source packaging/windows/internal/vc_install_helper.sh + conda create -yn python39 python=3.9 + conda activate python39 packaging/build_cmake.sh cmake_windows_gpu: @@ -1012,6 +1014,8 @@ jobs: set -ex source packaging/windows/internal/vc_install_helper.sh packaging/windows/internal/cuda_install.bat + conda create -yn python39 python=3.9 + conda activate python39 packaging/build_cmake.sh build_docs: diff --git a/.circleci/config.yml.in b/.circleci/config.yml.in index abc99065683..52c91699ef3 100644 --- a/.circleci/config.yml.in +++ b/.circleci/config.yml.in @@ -995,6 +995,8 @@ jobs: command: | set -ex source packaging/windows/internal/vc_install_helper.sh + conda create -yn python39 python=3.9 + conda activate python39 packaging/build_cmake.sh cmake_windows_gpu: @@ -1012,6 +1014,8 @@ jobs: set -ex source packaging/windows/internal/vc_install_helper.sh packaging/windows/internal/cuda_install.bat + conda create -yn python39 python=3.9 + conda activate python39 packaging/build_cmake.sh build_docs: From e7809b839bf97f6bb6411491ba8869c776a04c2c Mon Sep 17 00:00:00 2001 From: atalman Date: Wed, 1 Mar 2023 06:58:38 -0800 Subject: [PATCH 2/3] Actiavte conda fix --- .circleci/config.yml | 4 ++++ .circleci/config.yml.in | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6c8076f28e3..03e5020bb68 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -995,6 +995,8 @@ jobs: command: | set -ex source packaging/windows/internal/vc_install_helper.sh + eval "$('/C/tools/miniconda3/Scripts/conda.exe' 'shell.bash' 'hook')" + conda activate base conda create -yn python39 python=3.9 conda activate python39 packaging/build_cmake.sh @@ -1014,6 +1016,8 @@ jobs: set -ex source packaging/windows/internal/vc_install_helper.sh packaging/windows/internal/cuda_install.bat + eval "$('/C/tools/miniconda3/Scripts/conda.exe' 'shell.bash' 'hook')" + conda activate base conda create -yn python39 python=3.9 conda activate python39 packaging/build_cmake.sh diff --git a/.circleci/config.yml.in b/.circleci/config.yml.in index 52c91699ef3..43eebf9ffba 100644 --- a/.circleci/config.yml.in +++ b/.circleci/config.yml.in @@ -995,6 +995,8 @@ jobs: command: | set -ex source packaging/windows/internal/vc_install_helper.sh + eval "$('/C/tools/miniconda3/Scripts/conda.exe' 'shell.bash' 'hook')" + conda activate base conda create -yn python39 python=3.9 conda activate python39 packaging/build_cmake.sh @@ -1014,6 +1016,8 @@ jobs: set -ex source packaging/windows/internal/vc_install_helper.sh packaging/windows/internal/cuda_install.bat + eval "$('/C/tools/miniconda3/Scripts/conda.exe' 'shell.bash' 'hook')" + conda activate base conda create -yn python39 python=3.9 conda activate python39 packaging/build_cmake.sh From 6c26a73370eedaf8720eeaf23bdc6cd6511c5c00 Mon Sep 17 00:00:00 2001 From: atalman Date: Wed, 1 Mar 2023 07:22:45 -0800 Subject: [PATCH 3/3] fix cmake gpu --- .circleci/config.yml | 3 ++- .circleci/config.yml.in | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 03e5020bb68..7fad570b997 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1017,7 +1017,8 @@ jobs: source packaging/windows/internal/vc_install_helper.sh packaging/windows/internal/cuda_install.bat eval "$('/C/tools/miniconda3/Scripts/conda.exe' 'shell.bash' 'hook')" - conda activate base + conda activate + conda update -y conda conda create -yn python39 python=3.9 conda activate python39 packaging/build_cmake.sh diff --git a/.circleci/config.yml.in b/.circleci/config.yml.in index 43eebf9ffba..841cfc3f5ff 100644 --- a/.circleci/config.yml.in +++ b/.circleci/config.yml.in @@ -1017,7 +1017,8 @@ jobs: source packaging/windows/internal/vc_install_helper.sh packaging/windows/internal/cuda_install.bat eval "$('/C/tools/miniconda3/Scripts/conda.exe' 'shell.bash' 'hook')" - conda activate base + conda activate + conda update -y conda conda create -yn python39 python=3.9 conda activate python39 packaging/build_cmake.sh