From 189ed7feecbb422520e17ff106d8ba0c088489f1 Mon Sep 17 00:00:00 2001 From: Lucas Date: Tue, 24 Aug 2021 14:58:57 -0700 Subject: [PATCH 1/5] test installing numba from source to fix numpy 1.2.1 dependency error --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index b4e93e728..960bf642a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -22,6 +22,7 @@ # Install nupic.torch and nupic.tensorflow directly from github master branch nupic.torch @ git+https://github.com/numenta/nupic.torch.git nupic.tensorflow @ git+https://github.com/numenta/nupic.tensorflow.git +numba @ git+https://github.com/numba/numba.git awscli ax-platform From 1e2a730de9a5ae7b4a222797370be36d34bed060 Mon Sep 17 00:00:00 2001 From: Lucas Date: Tue, 24 Aug 2021 15:26:11 -0700 Subject: [PATCH 2/5] change numba to 0.4.3 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 960bf642a..e7a94f57c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -22,7 +22,7 @@ # Install nupic.torch and nupic.tensorflow directly from github master branch nupic.torch @ git+https://github.com/numenta/nupic.torch.git nupic.tensorflow @ git+https://github.com/numenta/nupic.tensorflow.git -numba @ git+https://github.com/numba/numba.git +numba==0.4.3 awscli ax-platform From 392a130195de6a2b84103280dd1caff5e9f91539 Mon Sep 17 00:00:00 2001 From: Lucas Date: Tue, 24 Aug 2021 16:02:16 -0700 Subject: [PATCH 3/5] Move numba installation to circleCI config yml --- .circleci/config.yml | 1 + requirements.txt | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b31d6de8c..ce87067c1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -90,6 +90,7 @@ jobs: key: pip-cache-v1-{{ arch }}-{{ checksum "nupic.torch.sha" }}-{{ checksum "nupic.tensorflow.sha" }}-{{ checksum "requirements.txt" }}-{{ checksum "requirements-dev.txt" }} # FIXME: Downgrading pip to 20.2 until we resolve all the issues with the new pip dependency resolver - run: pip install --user pip==20.2 + - run: pip install --user numba==0.4.3 - run: pip install --user flake8-formatter-junit-xml # FIXME: PEP-517 doesn't allow for editable installs. See https://github.com/pypa/pip/issues/7953 - run: pip install --no-use-pep517 --user -e ".[dev]" diff --git a/requirements.txt b/requirements.txt index e7a94f57c..b4e93e728 100644 --- a/requirements.txt +++ b/requirements.txt @@ -22,7 +22,6 @@ # Install nupic.torch and nupic.tensorflow directly from github master branch nupic.torch @ git+https://github.com/numenta/nupic.torch.git nupic.tensorflow @ git+https://github.com/numenta/nupic.tensorflow.git -numba==0.4.3 awscli ax-platform From 2e6d3b10e2bd6a3dd818d1a2d6142e713e1277d6 Mon Sep 17 00:00:00 2001 From: Lucas Date: Tue, 24 Aug 2021 16:04:52 -0700 Subject: [PATCH 4/5] fixes numba version --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ce87067c1..297c0feb9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -90,7 +90,7 @@ jobs: key: pip-cache-v1-{{ arch }}-{{ checksum "nupic.torch.sha" }}-{{ checksum "nupic.tensorflow.sha" }}-{{ checksum "requirements.txt" }}-{{ checksum "requirements-dev.txt" }} # FIXME: Downgrading pip to 20.2 until we resolve all the issues with the new pip dependency resolver - run: pip install --user pip==20.2 - - run: pip install --user numba==0.4.3 + - run: pip install --user numba==0.43.0 - run: pip install --user flake8-formatter-junit-xml # FIXME: PEP-517 doesn't allow for editable installs. See https://github.com/pypa/pip/issues/7953 - run: pip install --no-use-pep517 --user -e ".[dev]" From b54ddcfa0362452db15a27745060ba0bfb8e0791 Mon Sep 17 00:00:00 2001 From: Lucas Date: Tue, 24 Aug 2021 16:20:43 -0700 Subject: [PATCH 5/5] add fixme comment to numba custom installation command --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 297c0feb9..468c829bf 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -90,6 +90,7 @@ jobs: key: pip-cache-v1-{{ arch }}-{{ checksum "nupic.torch.sha" }}-{{ checksum "nupic.tensorflow.sha" }}-{{ checksum "requirements.txt" }}-{{ checksum "requirements-dev.txt" }} # FIXME: Downgrading pip to 20.2 until we resolve all the issues with the new pip dependency resolver - run: pip install --user pip==20.2 + # FIXME: remove numba installation command once dependency issues with numpy 1.21.2 is fixed on a new numba release - run: pip install --user numba==0.43.0 - run: pip install --user flake8-formatter-junit-xml # FIXME: PEP-517 doesn't allow for editable installs. See https://github.com/pypa/pip/issues/7953