From a08a8150d22dd037e7aba084602af3e58840cdce Mon Sep 17 00:00:00 2001 From: Justyn Temme Date: Tue, 22 Aug 2023 10:14:09 -0500 Subject: [PATCH 1/9] Update install_windows.bat Ensure pip3 is used to avoid python3/python2 collisions --- scripts/install_windows.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install_windows.bat b/scripts/install_windows.bat index be90396da..9f0b30b84 100644 --- a/scripts/install_windows.bat +++ b/scripts/install_windows.bat @@ -17,4 +17,4 @@ REM ###FOMM### call rmdir fomm /s /q call git clone https://github.com/alievk/first-order-model.git fomm -call pip install -r requirements.txt --use-feature=2020-resolver +call python3 -m pip install -r requirements.txt --use-feature=2020-resolver From c855270465a8ca6b2f971f336525b5d3d5adfe3b Mon Sep 17 00:00:00 2001 From: Justyn Temme Date: Wed, 23 Aug 2023 19:32:24 -0500 Subject: [PATCH 2/9] Update install_windows.bat --- scripts/install_windows.bat | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/install_windows.bat b/scripts/install_windows.bat index 9f0b30b84..b4cd53866 100644 --- a/scripts/install_windows.bat +++ b/scripts/install_windows.bat @@ -9,6 +9,7 @@ call scripts/settings_windows.bat call conda create -y -n %CONDA_ENV_NAME% python=3.7 call conda activate %CONDA_ENV_NAME% +call conda install -n base conda-libmamba-solver call conda install -y numpy==1.19.0 scikit-image python-blosc==1.7.0 -c conda-forge call conda install -y pytorch==1.7.1 torchvision cudatoolkit=11.0 -c pytorch call conda install -y -c anaconda git From 6013479bb7237c386bec4b1428b9ef65efad846c Mon Sep 17 00:00:00 2001 From: Justyn Temme Date: Wed, 23 Aug 2023 19:42:30 -0500 Subject: [PATCH 3/9] Update install_windows.bat use conda run to specify pip installed in conda environment --- scripts/install_windows.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install_windows.bat b/scripts/install_windows.bat index b4cd53866..d749344d1 100644 --- a/scripts/install_windows.bat +++ b/scripts/install_windows.bat @@ -18,4 +18,4 @@ REM ###FOMM### call rmdir fomm /s /q call git clone https://github.com/alievk/first-order-model.git fomm -call python3 -m pip install -r requirements.txt --use-feature=2020-resolver +call conda run pip install -r requirements.txt --use-feature=2020-resolver From 39bb4de927898d2ede23578ee3806816d70714ef Mon Sep 17 00:00:00 2001 From: Justyn Temme Date: Wed, 23 Aug 2023 19:46:36 -0500 Subject: [PATCH 4/9] Update install_windows.bat add pip as package in conda env, then use conda run to execute said pip version that uses the 2020-resolver as not to break with latest versions that don't have 2020-resolver --- scripts/install_windows.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install_windows.bat b/scripts/install_windows.bat index d749344d1..a7a98ea28 100644 --- a/scripts/install_windows.bat +++ b/scripts/install_windows.bat @@ -9,7 +9,7 @@ call scripts/settings_windows.bat call conda create -y -n %CONDA_ENV_NAME% python=3.7 call conda activate %CONDA_ENV_NAME% -call conda install -n base conda-libmamba-solver +call conda install -n base conda-libmamba-solver pip==21.0 call conda install -y numpy==1.19.0 scikit-image python-blosc==1.7.0 -c conda-forge call conda install -y pytorch==1.7.1 torchvision cudatoolkit=11.0 -c pytorch call conda install -y -c anaconda git From 6e52b46fbe4ba1e373e6c26f9673a730e0875cbe Mon Sep 17 00:00:00 2001 From: Justyn Temme Date: Wed, 23 Aug 2023 19:48:20 -0500 Subject: [PATCH 5/9] Update install_windows.bat use full version name --- scripts/install_windows.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install_windows.bat b/scripts/install_windows.bat index a7a98ea28..ec373469f 100644 --- a/scripts/install_windows.bat +++ b/scripts/install_windows.bat @@ -9,7 +9,7 @@ call scripts/settings_windows.bat call conda create -y -n %CONDA_ENV_NAME% python=3.7 call conda activate %CONDA_ENV_NAME% -call conda install -n base conda-libmamba-solver pip==21.0 +call conda install -n base conda-libmamba-solver pip==21.0.1 call conda install -y numpy==1.19.0 scikit-image python-blosc==1.7.0 -c conda-forge call conda install -y pytorch==1.7.1 torchvision cudatoolkit=11.0 -c pytorch call conda install -y -c anaconda git From 75fb3c8df44f494429ff682f7b7a1a0e999ce91c Mon Sep 17 00:00:00 2001 From: Justyn Temme Date: Wed, 23 Aug 2023 19:50:59 -0500 Subject: [PATCH 6/9] Update install_windows.bat use -y as this is a script --- scripts/install_windows.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install_windows.bat b/scripts/install_windows.bat index ec373469f..b74395fde 100644 --- a/scripts/install_windows.bat +++ b/scripts/install_windows.bat @@ -9,7 +9,7 @@ call scripts/settings_windows.bat call conda create -y -n %CONDA_ENV_NAME% python=3.7 call conda activate %CONDA_ENV_NAME% -call conda install -n base conda-libmamba-solver pip==21.0.1 +call conda install -y conda-libmamba-solver pip==21.0.1 call conda install -y numpy==1.19.0 scikit-image python-blosc==1.7.0 -c conda-forge call conda install -y pytorch==1.7.1 torchvision cudatoolkit=11.0 -c pytorch call conda install -y -c anaconda git From 2a1e31743a3c8c19951821426821fb6f2281f29c Mon Sep 17 00:00:00 2001 From: Justyn Temme Date: Thu, 24 Aug 2023 07:29:21 -0500 Subject: [PATCH 7/9] Update install_windows.bat --- scripts/install_windows.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install_windows.bat b/scripts/install_windows.bat index b74395fde..e35eb43cd 100644 --- a/scripts/install_windows.bat +++ b/scripts/install_windows.bat @@ -18,4 +18,4 @@ REM ###FOMM### call rmdir fomm /s /q call git clone https://github.com/alievk/first-order-model.git fomm -call conda run pip install -r requirements.txt --use-feature=2020-resolver +call conda run pip install -r requirements.txt From ddc839d4a5ebab08d317eb2cb7d86e643af22cdc Mon Sep 17 00:00:00 2001 From: Justyn Temme Date: Thu, 24 Aug 2023 08:47:20 -0500 Subject: [PATCH 8/9] Update install_mac.sh --- scripts/install_mac.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/install_mac.sh b/scripts/install_mac.sh index afd2f4375..02b3750e7 100755 --- a/scripts/install_mac.sh +++ b/scripts/install_mac.sh @@ -17,4 +17,6 @@ conda activate $CONDA_ENV_NAME #conda install -y pytorch==1.0.0 torchvision==0.2.1 -c pytorch #conda install -y python-blosc==1.7.0 -c conda-forge #conda install -y matplotlib==2.2.2 -pip install -r requirements_client.txt +conda install -y conda-libmamba-solver pip==21.0.1 + +conda run pip install -r requirements_client.txt From f79c5e8171dfda328781c184b314e1ab4ec024a0 Mon Sep 17 00:00:00 2001 From: Justyn Temme Date: Thu, 24 Aug 2023 08:47:40 -0500 Subject: [PATCH 9/9] Update install.sh --- scripts/install.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/install.sh b/scripts/install.sh index 58f2b0f32..46f6e3528 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -21,6 +21,7 @@ source $(conda info --base)/etc/profile.d/conda.sh conda create -y -n $CONDA_ENV_NAME python=3.7 conda activate $CONDA_ENV_NAME +conda install -y conda-libmamba-solver pip==21.0.1 conda install -y numpy==1.19.0 scikit-image python-blosc==1.7.0 -c conda-forge conda install -y pytorch==1.7.1 torchvision cudatoolkit=11.0 -c pytorch @@ -28,4 +29,4 @@ conda install -y pytorch==1.7.1 torchvision cudatoolkit=11.0 -c pytorch rm -rf fomm 2> /dev/null git clone https://github.com/alievk/first-order-model.git fomm -pip install -r requirements.txt +conda run pip install -r requirements.txt