From 8dbc5f173ef924d139721f7953df203defbbc320 Mon Sep 17 00:00:00 2001 From: Sait Cakmak Date: Mon, 6 Nov 2023 09:43:50 -0800 Subject: [PATCH 01/12] Update test_stable.yml --- .github/workflows/test_stable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_stable.yml b/.github/workflows/test_stable.yml index f457ef8f92..c805604dd1 100644 --- a/.github/workflows/test_stable.yml +++ b/.github/workflows/test_stable.yml @@ -78,7 +78,7 @@ jobs: req_txt="botorch.egg-info/requires.txt" min_torch_version=$(grep '\btorch[>=]=' ${req_txt} | sed 's/[^0-9.]//g') # HACK around the fact that pytorch does not offer a mac binary for 1.13.1 for py3.11 - TODO: Remove when bumping torch to 2.0.1 - min_torch_version=$(if [[ "${min_torch_version}"=="1.13.1" ]] && [[ "${PYTHON_VERSION}"=="3.11" ]] && [[ "${OS}"=="macos-latest" ]]; then echo "2.0.1"; else echo "${min_torch_version}"; fi) + min_torch_version=$(if [[ "${min_torch_version}"=="1.13.1" && "${PYTHON_VERSION}"=="3.11" && "${OS}"=="macos-latest" ]]; then echo "2.0.1"; else echo "${min_torch_version}"; fi) min_gpytorch_version=$(grep '\bgpytorch[>=]=' ${req_txt} | sed 's/[^0-9.]//g') min_linear_operator_version=$(grep '\blinear_operator[>=]=' ${req_txt} | sed 's/[^0-9.]//g') pip install "torch==${min_torch_version}" "gpytorch==${min_gpytorch_version}" "linear_operator==${min_linear_operator_version}" From 8d2c0fcf501070eff607facfd46840f1bf4544f9 Mon Sep 17 00:00:00 2001 From: Sait Cakmak Date: Mon, 6 Nov 2023 09:56:40 -0800 Subject: [PATCH 02/12] Update test_stable.yml --- .github/workflows/test_stable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_stable.yml b/.github/workflows/test_stable.yml index c805604dd1..f666f3bbe7 100644 --- a/.github/workflows/test_stable.yml +++ b/.github/workflows/test_stable.yml @@ -78,7 +78,7 @@ jobs: req_txt="botorch.egg-info/requires.txt" min_torch_version=$(grep '\btorch[>=]=' ${req_txt} | sed 's/[^0-9.]//g') # HACK around the fact that pytorch does not offer a mac binary for 1.13.1 for py3.11 - TODO: Remove when bumping torch to 2.0.1 - min_torch_version=$(if [[ "${min_torch_version}"=="1.13.1" && "${PYTHON_VERSION}"=="3.11" && "${OS}"=="macos-latest" ]]; then echo "2.0.1"; else echo "${min_torch_version}"; fi) + min_torch_version=$(if $min_torch_version == "1.13.1" && $PYTHON_VERSION == "3.11" && $OS == "macos-latest"; then echo "2.0.1"; else echo $min_torch_version; fi) min_gpytorch_version=$(grep '\bgpytorch[>=]=' ${req_txt} | sed 's/[^0-9.]//g') min_linear_operator_version=$(grep '\blinear_operator[>=]=' ${req_txt} | sed 's/[^0-9.]//g') pip install "torch==${min_torch_version}" "gpytorch==${min_gpytorch_version}" "linear_operator==${min_linear_operator_version}" From 9fa1b62deaa0476048a0c3028c12997a74f66160 Mon Sep 17 00:00:00 2001 From: Sait Cakmak Date: Mon, 6 Nov 2023 10:03:26 -0800 Subject: [PATCH 03/12] Update test_stable.yml --- .github/workflows/test_stable.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/test_stable.yml b/.github/workflows/test_stable.yml index f666f3bbe7..95fbf86475 100644 --- a/.github/workflows/test_stable.yml +++ b/.github/workflows/test_stable.yml @@ -70,15 +70,12 @@ jobs: with: python-version: ${{ matrix.python-version }} - name: Install dependencies - env: - PYTHON_VERSION: ${{ matrix.python-version }} - OS: ${{ matrix.os }} run: | python setup.py egg_info req_txt="botorch.egg-info/requires.txt" min_torch_version=$(grep '\btorch[>=]=' ${req_txt} | sed 's/[^0-9.]//g') # HACK around the fact that pytorch does not offer a mac binary for 1.13.1 for py3.11 - TODO: Remove when bumping torch to 2.0.1 - min_torch_version=$(if $min_torch_version == "1.13.1" && $PYTHON_VERSION == "3.11" && $OS == "macos-latest"; then echo "2.0.1"; else echo $min_torch_version; fi) + min_torch_version=${{if ( $min_torch_version == "1.13.1" && ${{ matrix.python-version }} == "3.11" && ${{ matrix.os }} == "macos-latest" ); then echo "2.0.1"; else echo $min_torch_version; fi}} min_gpytorch_version=$(grep '\bgpytorch[>=]=' ${req_txt} | sed 's/[^0-9.]//g') min_linear_operator_version=$(grep '\blinear_operator[>=]=' ${req_txt} | sed 's/[^0-9.]//g') pip install "torch==${min_torch_version}" "gpytorch==${min_gpytorch_version}" "linear_operator==${min_linear_operator_version}" From 8068acc0067d57a1a008e148ca8283ea5aaba50e Mon Sep 17 00:00:00 2001 From: Sait Cakmak Date: Mon, 6 Nov 2023 10:04:37 -0800 Subject: [PATCH 04/12] Update test_stable.yml --- .github/workflows/test_stable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_stable.yml b/.github/workflows/test_stable.yml index 95fbf86475..5daad7191e 100644 --- a/.github/workflows/test_stable.yml +++ b/.github/workflows/test_stable.yml @@ -75,7 +75,7 @@ jobs: req_txt="botorch.egg-info/requires.txt" min_torch_version=$(grep '\btorch[>=]=' ${req_txt} | sed 's/[^0-9.]//g') # HACK around the fact that pytorch does not offer a mac binary for 1.13.1 for py3.11 - TODO: Remove when bumping torch to 2.0.1 - min_torch_version=${{if ( $min_torch_version == "1.13.1" && ${{ matrix.python-version }} == "3.11" && ${{ matrix.os }} == "macos-latest" ); then echo "2.0.1"; else echo $min_torch_version; fi}} + min_torch_version=$(if ( $min_torch_version == "1.13.1" && ${{ matrix.python-version }} == "3.11" && ${{ matrix.os }} == "macos-latest" ); then echo "2.0.1"; else echo $min_torch_version; fi) min_gpytorch_version=$(grep '\bgpytorch[>=]=' ${req_txt} | sed 's/[^0-9.]//g') min_linear_operator_version=$(grep '\blinear_operator[>=]=' ${req_txt} | sed 's/[^0-9.]//g') pip install "torch==${min_torch_version}" "gpytorch==${min_gpytorch_version}" "linear_operator==${min_linear_operator_version}" From a1149da4386f153fd7b73b676c4072fee2a44680 Mon Sep 17 00:00:00 2001 From: Sait Cakmak Date: Mon, 6 Nov 2023 10:09:59 -0800 Subject: [PATCH 05/12] Update test_stable.yml --- .github/workflows/test_stable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_stable.yml b/.github/workflows/test_stable.yml index 5daad7191e..032ecf96f9 100644 --- a/.github/workflows/test_stable.yml +++ b/.github/workflows/test_stable.yml @@ -75,7 +75,7 @@ jobs: req_txt="botorch.egg-info/requires.txt" min_torch_version=$(grep '\btorch[>=]=' ${req_txt} | sed 's/[^0-9.]//g') # HACK around the fact that pytorch does not offer a mac binary for 1.13.1 for py3.11 - TODO: Remove when bumping torch to 2.0.1 - min_torch_version=$(if ( $min_torch_version == "1.13.1" && ${{ matrix.python-version }} == "3.11" && ${{ matrix.os }} == "macos-latest" ); then echo "2.0.1"; else echo $min_torch_version; fi) + min_torch_version=$(if ${min_torch_version} == "1.13.1" && ${{ matrix.python-version }} == "3.11" && ${{ matrix.os }} == "macos-latest"; then echo "2.0.1"; else echo ${min_torch_version}; fi) min_gpytorch_version=$(grep '\bgpytorch[>=]=' ${req_txt} | sed 's/[^0-9.]//g') min_linear_operator_version=$(grep '\blinear_operator[>=]=' ${req_txt} | sed 's/[^0-9.]//g') pip install "torch==${min_torch_version}" "gpytorch==${min_gpytorch_version}" "linear_operator==${min_linear_operator_version}" From d0086c691d9ab06fa12c030a8b8907ce9110832a Mon Sep 17 00:00:00 2001 From: Sait Cakmak Date: Mon, 6 Nov 2023 10:11:48 -0800 Subject: [PATCH 06/12] Update test_stable.yml --- .github/workflows/test_stable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_stable.yml b/.github/workflows/test_stable.yml index 032ecf96f9..10003e8cd3 100644 --- a/.github/workflows/test_stable.yml +++ b/.github/workflows/test_stable.yml @@ -75,7 +75,7 @@ jobs: req_txt="botorch.egg-info/requires.txt" min_torch_version=$(grep '\btorch[>=]=' ${req_txt} | sed 's/[^0-9.]//g') # HACK around the fact that pytorch does not offer a mac binary for 1.13.1 for py3.11 - TODO: Remove when bumping torch to 2.0.1 - min_torch_version=$(if ${min_torch_version} == "1.13.1" && ${{ matrix.python-version }} == "3.11" && ${{ matrix.os }} == "macos-latest"; then echo "2.0.1"; else echo ${min_torch_version}; fi) + min_torch_version=$(if "${min_torch_version}" == "1.13.1" && ${{ matrix.python-version == "3.11" }} && ${{ matrix.os == "macos-latest" }}; then echo "2.0.1"; else echo "${min_torch_version}"; fi) min_gpytorch_version=$(grep '\bgpytorch[>=]=' ${req_txt} | sed 's/[^0-9.]//g') min_linear_operator_version=$(grep '\blinear_operator[>=]=' ${req_txt} | sed 's/[^0-9.]//g') pip install "torch==${min_torch_version}" "gpytorch==${min_gpytorch_version}" "linear_operator==${min_linear_operator_version}" From 3223d5d2a4c706175bbd5f8cda87a58ba2854ab4 Mon Sep 17 00:00:00 2001 From: Sait Cakmak Date: Mon, 6 Nov 2023 10:12:43 -0800 Subject: [PATCH 07/12] Update test_stable.yml --- .github/workflows/test_stable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_stable.yml b/.github/workflows/test_stable.yml index 10003e8cd3..da5550559f 100644 --- a/.github/workflows/test_stable.yml +++ b/.github/workflows/test_stable.yml @@ -75,7 +75,7 @@ jobs: req_txt="botorch.egg-info/requires.txt" min_torch_version=$(grep '\btorch[>=]=' ${req_txt} | sed 's/[^0-9.]//g') # HACK around the fact that pytorch does not offer a mac binary for 1.13.1 for py3.11 - TODO: Remove when bumping torch to 2.0.1 - min_torch_version=$(if "${min_torch_version}" == "1.13.1" && ${{ matrix.python-version == "3.11" }} && ${{ matrix.os == "macos-latest" }}; then echo "2.0.1"; else echo "${min_torch_version}"; fi) + min_torch_version=$(if "${min_torch_version}" == "1.13.1" && ${{ matrix.python-version == '3.11' }} && ${{ matrix.os == 'macos-latest' }}; then echo "2.0.1"; else echo "${min_torch_version}"; fi) min_gpytorch_version=$(grep '\bgpytorch[>=]=' ${req_txt} | sed 's/[^0-9.]//g') min_linear_operator_version=$(grep '\blinear_operator[>=]=' ${req_txt} | sed 's/[^0-9.]//g') pip install "torch==${min_torch_version}" "gpytorch==${min_gpytorch_version}" "linear_operator==${min_linear_operator_version}" From 4f69f4264eb9f4efa51baf08ab6a8e7a02c89450 Mon Sep 17 00:00:00 2001 From: Sait Cakmak Date: Mon, 6 Nov 2023 10:15:32 -0800 Subject: [PATCH 08/12] Update test_stable.yml --- .github/workflows/test_stable.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test_stable.yml b/.github/workflows/test_stable.yml index da5550559f..144208633e 100644 --- a/.github/workflows/test_stable.yml +++ b/.github/workflows/test_stable.yml @@ -75,7 +75,8 @@ jobs: req_txt="botorch.egg-info/requires.txt" min_torch_version=$(grep '\btorch[>=]=' ${req_txt} | sed 's/[^0-9.]//g') # HACK around the fact that pytorch does not offer a mac binary for 1.13.1 for py3.11 - TODO: Remove when bumping torch to 2.0.1 - min_torch_version=$(if "${min_torch_version}" == "1.13.1" && ${{ matrix.python-version == '3.11' }} && ${{ matrix.os == 'macos-latest' }}; then echo "2.0.1"; else echo "${min_torch_version}"; fi) + # min_torch_version="$(if "${min_torch_version}" == "1.13.1" && ${{ matrix.python-version == '3.11' }} && ${{ matrix.os == 'macos-latest' }}; then echo "2.0.1"; else echo "${min_torch_version}"; fi)" + min_torch_version="$(if ${{ matrix.python-version == '3.11' }} && ${{ matrix.os == 'macos-latest' }}; then echo "2.0.1"; else echo "${min_torch_version}"; fi)" min_gpytorch_version=$(grep '\bgpytorch[>=]=' ${req_txt} | sed 's/[^0-9.]//g') min_linear_operator_version=$(grep '\blinear_operator[>=]=' ${req_txt} | sed 's/[^0-9.]//g') pip install "torch==${min_torch_version}" "gpytorch==${min_gpytorch_version}" "linear_operator==${min_linear_operator_version}" From 2afc988842890263852370efb1f27a20ec1d0d3d Mon Sep 17 00:00:00 2001 From: Sait Cakmak Date: Mon, 6 Nov 2023 10:21:05 -0800 Subject: [PATCH 09/12] Update test_stable.yml --- .github/workflows/test_stable.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test_stable.yml b/.github/workflows/test_stable.yml index 144208633e..766f757993 100644 --- a/.github/workflows/test_stable.yml +++ b/.github/workflows/test_stable.yml @@ -75,8 +75,8 @@ jobs: req_txt="botorch.egg-info/requires.txt" min_torch_version=$(grep '\btorch[>=]=' ${req_txt} | sed 's/[^0-9.]//g') # HACK around the fact that pytorch does not offer a mac binary for 1.13.1 for py3.11 - TODO: Remove when bumping torch to 2.0.1 - # min_torch_version="$(if "${min_torch_version}" == "1.13.1" && ${{ matrix.python-version == '3.11' }} && ${{ matrix.os == 'macos-latest' }}; then echo "2.0.1"; else echo "${min_torch_version}"; fi)" - min_torch_version="$(if ${{ matrix.python-version == '3.11' }} && ${{ matrix.os == 'macos-latest' }}; then echo "2.0.1"; else echo "${min_torch_version}"; fi)" + min_torch_version="$(if ${{ min_torch_version == '1.13.1' }} && ${{ matrix.python-version == '3.11' }} && ${{ matrix.os == 'macos-latest' }}; then echo "2.0.1"; else echo "${min_torch_version}"; fi)" + # min_torch_version="$(if ${{ matrix.python-version == '3.11' }} && ${{ matrix.os == 'macos-latest' }}; then echo "2.0.1"; else echo "${min_torch_version}"; fi)" min_gpytorch_version=$(grep '\bgpytorch[>=]=' ${req_txt} | sed 's/[^0-9.]//g') min_linear_operator_version=$(grep '\blinear_operator[>=]=' ${req_txt} | sed 's/[^0-9.]//g') pip install "torch==${min_torch_version}" "gpytorch==${min_gpytorch_version}" "linear_operator==${min_linear_operator_version}" From 2eb97ccffd195b05716bf46227b6b444f0973428 Mon Sep 17 00:00:00 2001 From: Sait Cakmak Date: Mon, 6 Nov 2023 10:21:46 -0800 Subject: [PATCH 10/12] Update test_stable.yml --- .github/workflows/test_stable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_stable.yml b/.github/workflows/test_stable.yml index 766f757993..bc1333acb8 100644 --- a/.github/workflows/test_stable.yml +++ b/.github/workflows/test_stable.yml @@ -75,7 +75,7 @@ jobs: req_txt="botorch.egg-info/requires.txt" min_torch_version=$(grep '\btorch[>=]=' ${req_txt} | sed 's/[^0-9.]//g') # HACK around the fact that pytorch does not offer a mac binary for 1.13.1 for py3.11 - TODO: Remove when bumping torch to 2.0.1 - min_torch_version="$(if ${{ min_torch_version == '1.13.1' }} && ${{ matrix.python-version == '3.11' }} && ${{ matrix.os == 'macos-latest' }}; then echo "2.0.1"; else echo "${min_torch_version}"; fi)" + min_torch_version="$(if ${{ $min_torch_version == '1.13.1' }} && ${{ matrix.python-version == '3.11' }} && ${{ matrix.os == 'macos-latest' }}; then echo "2.0.1"; else echo "${min_torch_version}"; fi)" # min_torch_version="$(if ${{ matrix.python-version == '3.11' }} && ${{ matrix.os == 'macos-latest' }}; then echo "2.0.1"; else echo "${min_torch_version}"; fi)" min_gpytorch_version=$(grep '\bgpytorch[>=]=' ${req_txt} | sed 's/[^0-9.]//g') min_linear_operator_version=$(grep '\blinear_operator[>=]=' ${req_txt} | sed 's/[^0-9.]//g') From 52a52127357916f6187153e7ea7d16a0b43470b9 Mon Sep 17 00:00:00 2001 From: Sait Cakmak Date: Mon, 6 Nov 2023 10:23:51 -0800 Subject: [PATCH 11/12] Update test_stable.yml --- .github/workflows/test_stable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_stable.yml b/.github/workflows/test_stable.yml index bc1333acb8..041bf9d950 100644 --- a/.github/workflows/test_stable.yml +++ b/.github/workflows/test_stable.yml @@ -75,7 +75,7 @@ jobs: req_txt="botorch.egg-info/requires.txt" min_torch_version=$(grep '\btorch[>=]=' ${req_txt} | sed 's/[^0-9.]//g') # HACK around the fact that pytorch does not offer a mac binary for 1.13.1 for py3.11 - TODO: Remove when bumping torch to 2.0.1 - min_torch_version="$(if ${{ $min_torch_version == '1.13.1' }} && ${{ matrix.python-version == '3.11' }} && ${{ matrix.os == 'macos-latest' }}; then echo "2.0.1"; else echo "${min_torch_version}"; fi)" + min_torch_version="$(if $min_torch_version == '1.13.1' && ${{ matrix.python-version == '3.11' }} && ${{ matrix.os == 'macos-latest' }}; then echo "2.0.1"; else echo "${min_torch_version}"; fi)" # min_torch_version="$(if ${{ matrix.python-version == '3.11' }} && ${{ matrix.os == 'macos-latest' }}; then echo "2.0.1"; else echo "${min_torch_version}"; fi)" min_gpytorch_version=$(grep '\bgpytorch[>=]=' ${req_txt} | sed 's/[^0-9.]//g') min_linear_operator_version=$(grep '\blinear_operator[>=]=' ${req_txt} | sed 's/[^0-9.]//g') From 8478aad75851e9aebd3f5ba4f11951c2ffb3c013 Mon Sep 17 00:00:00 2001 From: Sait Cakmak Date: Mon, 6 Nov 2023 10:24:53 -0800 Subject: [PATCH 12/12] Update test_stable.yml --- .github/workflows/test_stable.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/test_stable.yml b/.github/workflows/test_stable.yml index 041bf9d950..6cbb905aa6 100644 --- a/.github/workflows/test_stable.yml +++ b/.github/workflows/test_stable.yml @@ -75,8 +75,7 @@ jobs: req_txt="botorch.egg-info/requires.txt" min_torch_version=$(grep '\btorch[>=]=' ${req_txt} | sed 's/[^0-9.]//g') # HACK around the fact that pytorch does not offer a mac binary for 1.13.1 for py3.11 - TODO: Remove when bumping torch to 2.0.1 - min_torch_version="$(if $min_torch_version == '1.13.1' && ${{ matrix.python-version == '3.11' }} && ${{ matrix.os == 'macos-latest' }}; then echo "2.0.1"; else echo "${min_torch_version}"; fi)" - # min_torch_version="$(if ${{ matrix.python-version == '3.11' }} && ${{ matrix.os == 'macos-latest' }}; then echo "2.0.1"; else echo "${min_torch_version}"; fi)" + min_torch_version="$(if ${{ matrix.python-version == '3.11' }} && ${{ matrix.os == 'macos-latest' }}; then echo "2.0.1"; else echo "${min_torch_version}"; fi)" min_gpytorch_version=$(grep '\bgpytorch[>=]=' ${req_txt} | sed 's/[^0-9.]//g') min_linear_operator_version=$(grep '\blinear_operator[>=]=' ${req_txt} | sed 's/[^0-9.]//g') pip install "torch==${min_torch_version}" "gpytorch==${min_gpytorch_version}" "linear_operator==${min_linear_operator_version}"