From 008036427e86cca929aea98bb0ed8b088adfc46d Mon Sep 17 00:00:00 2001 From: Sait Cakmak Date: Fri, 6 Sep 2024 16:52:47 -0400 Subject: [PATCH 01/23] Update meta.yaml --- .conda/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.conda/meta.yaml b/.conda/meta.yaml index 04248a8886..deb98e8622 100644 --- a/.conda/meta.yaml +++ b/.conda/meta.yaml @@ -17,9 +17,9 @@ requirements: - setuptools - setuptools_scm run: - - pytorch >=1.13.1 - - gpytorch ==1.12 - - linear_operator ==0.5.2 + - pytorch >=2.0 + - gpytorch ==1.12.1 + - linear_operator ==0.5.3 - scipy - multipledispatch - pyro-ppl >=1.8.4 From 9cc0b189029e6199e6af80eec4ce1282b97cf7bd Mon Sep 17 00:00:00 2001 From: Sait Cakmak Date: Fri, 6 Sep 2024 16:53:21 -0400 Subject: [PATCH 02/23] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 21ee4aebbd..b47cdd7ebf 100644 --- a/README.md +++ b/README.md @@ -56,9 +56,9 @@ Optimization simply use Ax. **Installation Requirements** - Python >= 3.10 -- PyTorch >= 1.13.1 -- gpytorch == 1.12 -- linear_operator == 0.5.2 +- PyTorch >= 2.0 +- gpytorch == 1.12.1 +- linear_operator == 0.5.3 - pyro-ppl >= 1.8.4 - scipy - multiple-dispatch From 6b13ccba247fd96da64c52b373775ebaa308b636 Mon Sep 17 00:00:00 2001 From: Sait Cakmak Date: Fri, 6 Sep 2024 16:53:58 -0400 Subject: [PATCH 03/23] Update environment.yml --- environment.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/environment.yml b/environment.yml index f659c7b9c3..ed26e0eba6 100644 --- a/environment.yml +++ b/environment.yml @@ -4,9 +4,9 @@ channels: - gpytorch - conda-forge dependencies: - - pytorch>=1.13.1 - - gpytorch==1.12 - - linear_operator==0.5.2 + - pytorch>=2.0 + - gpytorch==1.12.1 + - linear_operator==0.5.3 - scipy - multipledispatch - pyro-ppl>=1.8.4 From 3a054e2f185e1f71f6667db8510931d92f3c4d44 Mon Sep 17 00:00:00 2001 From: Sait Cakmak Date: Fri, 6 Sep 2024 16:54:31 -0400 Subject: [PATCH 04/23] Update requirements.txt --- requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index c094eede8e..a00e5a9a56 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ multipledispatch scipy mpmath>=0.19,<=1.3 -torch>=1.13.1 +torch>=2.0 pyro-ppl>=1.8.4 -gpytorch==1.12 -linear_operator==0.5.2 +gpytorch==1.12.1 +linear_operator==0.5.3 From 9e001999888dacae05bbcb849725f5f32bbba8e7 Mon Sep 17 00:00:00 2001 From: Sait Cakmak Date: Fri, 6 Sep 2024 16:57:43 -0400 Subject: [PATCH 05/23] Update test_stable.yml --- .github/workflows/test_stable.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/test_stable.yml b/.github/workflows/test_stable.yml index 4294e165f1..4b680b45fc 100644 --- a/.github/workflows/test_stable.yml +++ b/.github/workflows/test_stable.yml @@ -62,8 +62,6 @@ jobs: 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 ${{ matrix.python-version == '3.11' }} && ${{ matrix.os == 'macos-14' }}; 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 a2ca6f4e9b4666cac9fd715c4541d8711cf85d9d Mon Sep 17 00:00:00 2001 From: Sait Cakmak Date: Fri, 6 Sep 2024 19:12:46 -0400 Subject: [PATCH 06/23] Update meta.yaml --- .conda/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.conda/meta.yaml b/.conda/meta.yaml index deb98e8622..a8c0e68baf 100644 --- a/.conda/meta.yaml +++ b/.conda/meta.yaml @@ -17,8 +17,8 @@ requirements: - setuptools - setuptools_scm run: - - pytorch >=2.0 - - gpytorch ==1.12.1 + - pytorch >=2.0.1 + - gpytorch ==1.13 - linear_operator ==0.5.3 - scipy - multipledispatch From 4a3d733888638d9714379afbc1b81361201c7c0e Mon Sep 17 00:00:00 2001 From: Sait Cakmak Date: Fri, 6 Sep 2024 19:13:15 -0400 Subject: [PATCH 07/23] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b47cdd7ebf..d10fa94c66 100644 --- a/README.md +++ b/README.md @@ -56,8 +56,8 @@ Optimization simply use Ax. **Installation Requirements** - Python >= 3.10 -- PyTorch >= 2.0 -- gpytorch == 1.12.1 +- PyTorch >= 2.0.1 +- gpytorch == 1.13 - linear_operator == 0.5.3 - pyro-ppl >= 1.8.4 - scipy From 3f6b1ecb84b033a164c14b0e950e20f8572ad969 Mon Sep 17 00:00:00 2001 From: Sait Cakmak Date: Fri, 6 Sep 2024 19:13:32 -0400 Subject: [PATCH 08/23] Update environment.yml --- environment.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/environment.yml b/environment.yml index ed26e0eba6..9957bcd731 100644 --- a/environment.yml +++ b/environment.yml @@ -4,8 +4,8 @@ channels: - gpytorch - conda-forge dependencies: - - pytorch>=2.0 - - gpytorch==1.12.1 + - pytorch>=2.0.1 + - gpytorch==1.13 - linear_operator==0.5.3 - scipy - multipledispatch From 1760c003f3fbefc2757ecba8ac2fc5e216dffb59 Mon Sep 17 00:00:00 2001 From: Sait Cakmak Date: Fri, 6 Sep 2024 19:14:09 -0400 Subject: [PATCH 09/23] Update requirements.txt --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index a00e5a9a56..3fbe7d8a05 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ multipledispatch scipy mpmath>=0.19,<=1.3 -torch>=2.0 +torch>=2.0.1 pyro-ppl>=1.8.4 -gpytorch==1.12.1 +gpytorch==1.13 linear_operator==0.5.3 From af0a47c75b77974fd7a5ffe1d37c5cf2a083159e Mon Sep 17 00:00:00 2001 From: Sait Cakmak Date: Fri, 6 Sep 2024 19:47:11 -0400 Subject: [PATCH 10/23] Update test_stable.yml --- .github/workflows/test_stable.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test_stable.yml b/.github/workflows/test_stable.yml index 4b680b45fc..0093af6eeb 100644 --- a/.github/workflows/test_stable.yml +++ b/.github/workflows/test_stable.yml @@ -59,6 +59,7 @@ jobs: python-version: ${{ matrix.python-version }} - name: Install dependencies run: | + pip install setuptools # Needed for next line on Python 3.12. python setup.py egg_info req_txt="botorch.egg-info/requires.txt" min_torch_version=$(grep '\btorch[>=]=' ${req_txt} | sed 's/[^0-9.]//g') From f11e8dce6308baf64a360bbcbd1d09a766794ede Mon Sep 17 00:00:00 2001 From: Sait Cakmak Date: Fri, 6 Sep 2024 19:49:01 -0400 Subject: [PATCH 11/23] Update test_stable.yml --- .github/workflows/test_stable.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test_stable.yml b/.github/workflows/test_stable.yml index 0093af6eeb..8a65b1ba1f 100644 --- a/.github/workflows/test_stable.yml +++ b/.github/workflows/test_stable.yml @@ -38,10 +38,12 @@ jobs: conda install -y -c gpytorch gpytorch conda install -y -c conda-forge pyro-ppl>=1.8.4 pip install .[test] - - name: Unit tests - shell: bash -l {0} + - name: Unit tests and coverage -- BoTorch + run: | + pytest -ra test/ --cov botorch/ --cov-report term-missing --cov-report xml:botorch_cov.xml + - name: Unit tests and coverage -- BoTorch Community run: | - pytest -ra + pytest -ra test_community/ --cov botorch_community/ --cov-report term-missing --cov-report xml:botorch_community_cov.xml tests-and-coverage-min-req-pip: name: Tests and coverage min req. torch, gpytorch & linear_operator versions (pip, Python ${{ matrix.python-version }}, ${{ matrix.os }}) @@ -67,9 +69,12 @@ jobs: 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}" pip install .[test] - - name: Unit tests and coverage + - name: Unit tests and coverage -- BoTorch + run: | + pytest -ra test/ --cov botorch/ --cov-report term-missing --cov-report xml:botorch_cov.xml + - name: Unit tests and coverage -- BoTorch Community run: | - pytest -ra --cov=. --cov-report term-missing + pytest -ra test_community/ --cov botorch_community/ --cov-report term-missing --cov-report xml:botorch_community_cov.xml run_tutorials_stable_w_latest_ax: name: Run tutorials without smoke test on min req. versions of PyTorch & GPyTorch and latest Ax From c90c64aaf2af031663974fd08fc4580390c1b73b Mon Sep 17 00:00:00 2001 From: Sait Cakmak Date: Fri, 6 Sep 2024 19:52:29 -0400 Subject: [PATCH 12/23] Update test_stable.yml --- .github/workflows/test_stable.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test_stable.yml b/.github/workflows/test_stable.yml index 8a65b1ba1f..56b202a0c5 100644 --- a/.github/workflows/test_stable.yml +++ b/.github/workflows/test_stable.yml @@ -65,6 +65,8 @@ jobs: python setup.py egg_info req_txt="botorch.egg-info/requires.txt" min_torch_version=$(grep '\btorch[>=]=' ${req_txt} | sed 's/[^0-9.]//g') + # The earliest PyTorch version on Python 3.12 is 2.2.0. + min_torch_version="$(if ${{ matrix.python-version == '3.12' }}; then echo "2.2.0"; 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 989af9b54834dc4799d9ce10dababa418245f36b Mon Sep 17 00:00:00 2001 From: Sait Cakmak Date: Fri, 6 Sep 2024 19:56:35 -0400 Subject: [PATCH 13/23] Update meta.yaml --- .conda/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.conda/meta.yaml b/.conda/meta.yaml index a8c0e68baf..458a9f1694 100644 --- a/.conda/meta.yaml +++ b/.conda/meta.yaml @@ -19,7 +19,7 @@ requirements: run: - pytorch >=2.0.1 - gpytorch ==1.13 - - linear_operator ==0.5.3 + - linear_operator ==0.5.4 - scipy - multipledispatch - pyro-ppl >=1.8.4 From cbcad3cd8b0d9a52a486886c2ee059045c2e52ad Mon Sep 17 00:00:00 2001 From: Sait Cakmak Date: Fri, 6 Sep 2024 19:57:00 -0400 Subject: [PATCH 14/23] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d10fa94c66..8a245bc216 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,7 @@ Optimization simply use Ax. - Python >= 3.10 - PyTorch >= 2.0.1 - gpytorch == 1.13 -- linear_operator == 0.5.3 +- linear_operator == 0.5.4 - pyro-ppl >= 1.8.4 - scipy - multiple-dispatch From c372bf367955e4ece0a65d1fde7a6a8d9fedeeb6 Mon Sep 17 00:00:00 2001 From: Sait Cakmak Date: Fri, 6 Sep 2024 19:57:12 -0400 Subject: [PATCH 15/23] Update environment.yml --- environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index 9957bcd731..33dd6c57d4 100644 --- a/environment.yml +++ b/environment.yml @@ -6,7 +6,7 @@ channels: dependencies: - pytorch>=2.0.1 - gpytorch==1.13 - - linear_operator==0.5.3 + - linear_operator==0.5.4 - scipy - multipledispatch - pyro-ppl>=1.8.4 From d6c2622f0ebb6d4f35297e4b38ee0f347e8ed82e Mon Sep 17 00:00:00 2001 From: Sait Cakmak Date: Fri, 6 Sep 2024 19:57:23 -0400 Subject: [PATCH 16/23] Update requirements.txt --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 3fbe7d8a05..ac58da18c0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,4 +4,4 @@ mpmath>=0.19,<=1.3 torch>=2.0.1 pyro-ppl>=1.8.4 gpytorch==1.13 -linear_operator==0.5.3 +linear_operator==0.5.4 From 74ce0a5ad3bc97d4da8f1eea335fda5779eec96d Mon Sep 17 00:00:00 2001 From: Sait Cakmak Date: Fri, 6 Sep 2024 19:59:42 -0400 Subject: [PATCH 17/23] Update meta.yaml --- .conda/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.conda/meta.yaml b/.conda/meta.yaml index 458a9f1694..a8c0e68baf 100644 --- a/.conda/meta.yaml +++ b/.conda/meta.yaml @@ -19,7 +19,7 @@ requirements: run: - pytorch >=2.0.1 - gpytorch ==1.13 - - linear_operator ==0.5.4 + - linear_operator ==0.5.3 - scipy - multipledispatch - pyro-ppl >=1.8.4 From c5c6883295f60911aa2ebe96a670a3ade09f6668 Mon Sep 17 00:00:00 2001 From: Sait Cakmak Date: Fri, 6 Sep 2024 20:00:08 -0400 Subject: [PATCH 18/23] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8a245bc216..d10fa94c66 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,7 @@ Optimization simply use Ax. - Python >= 3.10 - PyTorch >= 2.0.1 - gpytorch == 1.13 -- linear_operator == 0.5.4 +- linear_operator == 0.5.3 - pyro-ppl >= 1.8.4 - scipy - multiple-dispatch From 6e0e173ce992ee94491ccb8fd854f43324fd7588 Mon Sep 17 00:00:00 2001 From: Sait Cakmak Date: Fri, 6 Sep 2024 20:00:20 -0400 Subject: [PATCH 19/23] Update environment.yml --- environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index 33dd6c57d4..9957bcd731 100644 --- a/environment.yml +++ b/environment.yml @@ -6,7 +6,7 @@ channels: dependencies: - pytorch>=2.0.1 - gpytorch==1.13 - - linear_operator==0.5.4 + - linear_operator==0.5.3 - scipy - multipledispatch - pyro-ppl>=1.8.4 From b2e7b13e8199aef3446a1f8a539292a7a44d0f12 Mon Sep 17 00:00:00 2001 From: Sait Cakmak Date: Fri, 6 Sep 2024 20:00:32 -0400 Subject: [PATCH 20/23] Update requirements.txt --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index ac58da18c0..3fbe7d8a05 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,4 +4,4 @@ mpmath>=0.19,<=1.3 torch>=2.0.1 pyro-ppl>=1.8.4 gpytorch==1.13 -linear_operator==0.5.4 +linear_operator==0.5.3 From d4d697f6a980d9fdef5181fe09260e15cec1bdaa Mon Sep 17 00:00:00 2001 From: Sait Cakmak Date: Fri, 6 Sep 2024 20:04:22 -0400 Subject: [PATCH 21/23] Update test_stable.yml --- .github/workflows/test_stable.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test_stable.yml b/.github/workflows/test_stable.yml index 56b202a0c5..baa7a55448 100644 --- a/.github/workflows/test_stable.yml +++ b/.github/workflows/test_stable.yml @@ -39,9 +39,11 @@ jobs: conda install -y -c conda-forge pyro-ppl>=1.8.4 pip install .[test] - name: Unit tests and coverage -- BoTorch + shell: bash -l {0} run: | pytest -ra test/ --cov botorch/ --cov-report term-missing --cov-report xml:botorch_cov.xml - name: Unit tests and coverage -- BoTorch Community + shell: bash -l {0} run: | pytest -ra test_community/ --cov botorch_community/ --cov-report term-missing --cov-report xml:botorch_community_cov.xml From 198d54553ae99f116060a87fbdf7d9b572c093b6 Mon Sep 17 00:00:00 2001 From: Sait Cakmak Date: Sat, 7 Sep 2024 13:55:44 +0200 Subject: [PATCH 22/23] Update reusable_tutorials.yml --- .github/workflows/reusable_tutorials.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/reusable_tutorials.yml b/.github/workflows/reusable_tutorials.yml index 0b9aa1120b..f994f4bce3 100644 --- a/.github/workflows/reusable_tutorials.yml +++ b/.github/workflows/reusable_tutorials.yml @@ -54,6 +54,7 @@ jobs: min_torch_version=$(grep '\btorch[>=]=' ${req_txt} | sed 's/[^0-9.]//g') 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 "numpy<2" # Numpy >2.0 is not compatible with PyTorch <2.2. pip install "torch==${min_torch_version}" "gpytorch==${min_gpytorch_version}" "linear_operator==${min_linear_operator_version}" torchvision - name: Install BoTorch with tutorials dependencies env: From 2a35bf0774d0608ae53f1d9340e7af841f9e1407 Mon Sep 17 00:00:00 2001 From: Sait Cakmak Date: Sat, 7 Sep 2024 13:56:08 +0200 Subject: [PATCH 23/23] Update test_stable.yml --- .github/workflows/test_stable.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test_stable.yml b/.github/workflows/test_stable.yml index baa7a55448..1eabadd15b 100644 --- a/.github/workflows/test_stable.yml +++ b/.github/workflows/test_stable.yml @@ -71,6 +71,7 @@ jobs: min_torch_version="$(if ${{ matrix.python-version == '3.12' }}; then echo "2.2.0"; 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 "numpy<2" # Numpy >2.0 is not compatible with PyTorch <2.2. pip install "torch==${min_torch_version}" "gpytorch==${min_gpytorch_version}" "linear_operator==${min_linear_operator_version}" pip install .[test] - name: Unit tests and coverage -- BoTorch