From 79b89fc179f982408151fef23bf2adcde7c5f666 Mon Sep 17 00:00:00 2001 From: kshitijrajsharma Date: Wed, 14 Jun 2023 17:02:31 +0545 Subject: [PATCH 01/11] Remove numpy --- .github/workflows/build.yml | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ee274431..a16e14e8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,26 +16,24 @@ jobs: with: python-version: 3.8 - - name : Clone Ramp - run : - git clone https://github.com/kshitijrajsharma/ramp-code-fAIr.git ramp-code + - name: Clone Ramp + run: git clone https://github.com/kshitijrajsharma/ramp-code-fAIr.git ramp-code - - name : Install gdown - run : pip install gdown + - name: Install gdown + run: pip install gdown - name: Download Basemodel run: gdown --fuzzy https://drive.google.com/file/d/1wvJhkiOrSlHmmvJ0avkAdu9sslFf5_I0/view?usp=sharing - name: Unzip and Move Basemodel run: unzip checkpoint.tf.zip -d ramp-code/ramp - + - name: Add ubuntugis ppa & Update - run: - sudo add-apt-repository ppa:ubuntugis/ppa && sudo apt-get update - - name : Install numpy - run: - pip install numpy==1.23.5 - - name: Install gdal + run: sudo add-apt-repository ppa:ubuntugis/ppa && sudo apt-get update + # - name : Install numpy + # run: + # pip install numpy==1.23.5 + - name: Install gdal run: | sudo apt-get install gdal-bin sudo apt-get install libgdal-dev @@ -45,18 +43,16 @@ jobs: - name: Install ramp dependecies run: | - cd ramp-code && cd colab && make install + cd ramp-code && cd colab && make install - name: Navigate to home dir run: | cd ../.. ls - - name : Install tensorflow - run : - pip install tensorflow==2.9.2 + - name: Install tensorflow + run: pip install tensorflow==2.9.2 - - name : Install fair utilities - run: - pip install -e . + - name: Install fair utilities + run: pip install -e . - name: Run test workflow run: | From 221be71c10801539923edd4f56362da4da324b30 Mon Sep 17 00:00:00 2001 From: kshitijrajsharma Date: Wed, 14 Jun 2023 17:16:09 +0545 Subject: [PATCH 02/11] don't force numpy --- .github/workflows/build.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a16e14e8..ff954208 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,9 +30,10 @@ jobs: - name: Add ubuntugis ppa & Update run: sudo add-apt-repository ppa:ubuntugis/ppa && sudo apt-get update - # - name : Install numpy - # run: - # pip install numpy==1.23.5 + + - name: Install numpy + run: pip install numpy + - name: Install gdal run: | sudo apt-get install gdal-bin From e0469fe9c2138e04f71d9bc6d685f50c2a8f6d06 Mon Sep 17 00:00:00 2001 From: kshitijrajsharma Date: Thu, 15 Jun 2023 07:56:32 +0545 Subject: [PATCH 03/11] Install gdal clean --- .github/workflows/build.yml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ff954208..a0514292 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,18 +28,9 @@ jobs: - name: Unzip and Move Basemodel run: unzip checkpoint.tf.zip -d ramp-code/ramp - - name: Add ubuntugis ppa & Update - run: sudo add-apt-repository ppa:ubuntugis/ppa && sudo apt-get update - - - name: Install numpy - run: pip install numpy - - name: Install gdal run: | - sudo apt-get install gdal-bin - sudo apt-get install libgdal-dev - export CPLUS_INCLUDE_PATH=/usr/include/gdal - export C_INCLUDE_PATH=/usr/include/gdal + sudo apt-get -y install gdal-bin python3-gdal && sudo apt-get -y autoremove && sudo apt-get clean pip install --global-option=build_ext --global-option="-I/usr/include/gdal" GDAL==`gdal-config --version` - name: Install ramp dependecies From debbfff3e9b14f9043386a699f98442ab4a50bd8 Mon Sep 17 00:00:00 2001 From: kshitijrajsharma Date: Thu, 15 Jun 2023 07:58:52 +0545 Subject: [PATCH 04/11] Install gdal with 3.4.3 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a0514292..70489c8f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,7 +31,7 @@ jobs: - name: Install gdal run: | sudo apt-get -y install gdal-bin python3-gdal && sudo apt-get -y autoremove && sudo apt-get clean - pip install --global-option=build_ext --global-option="-I/usr/include/gdal" GDAL==`gdal-config --version` + pip install gdal==3.4.3 - name: Install ramp dependecies run: | From dab2df058e19b85aa9523a35c60b22385bc8609b Mon Sep 17 00:00:00 2001 From: kshitijrajsharma Date: Thu, 15 Jun 2023 08:01:12 +0545 Subject: [PATCH 05/11] install libgdal dev --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 70489c8f..f09e5535 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,7 +30,7 @@ jobs: - name: Install gdal run: | - sudo apt-get -y install gdal-bin python3-gdal && sudo apt-get -y autoremove && sudo apt-get clean + sudo apt-get -y install gdal-bin libgdal-dev python3-gdal && sudo apt-get -y autoremove && sudo apt-get clean pip install gdal==3.4.3 - name: Install ramp dependecies From a29eeaad0ccdf3cf9987c354c19c3b600ce66785 Mon Sep 17 00:00:00 2001 From: kshitijrajsharma Date: Thu, 15 Jun 2023 08:15:44 +0545 Subject: [PATCH 06/11] change pandas version , bumped down gdal --- .github/workflows/build.yml | 2 +- pyproject.toml | 2 +- requirements.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f09e5535..070f7be0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,7 +31,7 @@ jobs: - name: Install gdal run: | sudo apt-get -y install gdal-bin libgdal-dev python3-gdal && sudo apt-get -y autoremove && sudo apt-get clean - pip install gdal==3.4.3 + pip install gdal==2.4.0 - name: Install ramp dependecies run: | diff --git a/pyproject.toml b/pyproject.toml index 1b6dcff8..4ed3c2b3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -19,7 +19,7 @@ keywords = [ ] dependencies = [ "shapely==1.8.0", "GDAL", "numpy", - "Pillow==9.0.1", "geopandas==0.10.2","pandas==1.5.3", + "Pillow==9.0.1", "geopandas==0.10.2","pandas==2.0.2", "rasterio", "mercantile==1.2.1", "tqdm==4.62.3", "rtree", "opencv-python==4.5.5.64","ramp-fair==0.1.2" ] diff --git a/requirements.txt b/requirements.txt index 0d49a92e..97fc1eca 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,7 @@ numpy gdal Pillow==9.0.1 geopandas==0.10.2 -pandas==1.5.3 +pandas==2.0.2 rasterio tqdm==4.62.3 Rtree From f8cb1b6c609db35589cfd685f8b286619d496c53 Mon Sep 17 00:00:00 2001 From: kshitijrajsharma Date: Thu, 15 Jun 2023 08:21:51 +0545 Subject: [PATCH 07/11] gdal 3.0.2 same as dev --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 070f7be0..336b874b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,7 +31,7 @@ jobs: - name: Install gdal run: | sudo apt-get -y install gdal-bin libgdal-dev python3-gdal && sudo apt-get -y autoremove && sudo apt-get clean - pip install gdal==2.4.0 + pip install gdal==3.0.2 - name: Install ramp dependecies run: | From 366072aa29abd5adbd0a0274a6123c7d8df39c18 Mon Sep 17 00:00:00 2001 From: kshitijrajsharma Date: Thu, 15 Jun 2023 08:26:21 +0545 Subject: [PATCH 08/11] install from global option --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 336b874b..2141922b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,7 +31,8 @@ jobs: - name: Install gdal run: | sudo apt-get -y install gdal-bin libgdal-dev python3-gdal && sudo apt-get -y autoremove && sudo apt-get clean - pip install gdal==3.0.2 + pip install numpy + pip install GDAL==$(gdal-config --version) --global-option=build_ext --global-option="-I/usr/include/gdal" - name: Install ramp dependecies run: | From 726941823a3372eb7574b81cd0a56505aad60e9c Mon Sep 17 00:00:00 2001 From: kshitijrajsharma Date: Thu, 15 Jun 2023 08:36:38 +0545 Subject: [PATCH 09/11] uninstall gdal and rebuild again --- .github/workflows/build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2141922b..b6166fc4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,7 +31,6 @@ jobs: - name: Install gdal run: | sudo apt-get -y install gdal-bin libgdal-dev python3-gdal && sudo apt-get -y autoremove && sudo apt-get clean - pip install numpy pip install GDAL==$(gdal-config --version) --global-option=build_ext --global-option="-I/usr/include/gdal" - name: Install ramp dependecies @@ -49,4 +48,7 @@ jobs: - name: Run test workflow run: | + pip uninstall gdal + pip install numpy + pip install GDAL==$(gdal-config --version) --global-option=build_ext --global-option="-I/usr/include/gdal" python test_app.py From e1231d53316f2385c87dfd4b4579ec3dbd141302 Mon Sep 17 00:00:00 2001 From: kshitijrajsharma Date: Thu, 15 Jun 2023 08:59:01 +0545 Subject: [PATCH 10/11] uninstall gdal with -y option --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b6166fc4..213c6973 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -48,7 +48,7 @@ jobs: - name: Run test workflow run: | - pip uninstall gdal + pip uninstall -y gdal pip install numpy pip install GDAL==$(gdal-config --version) --global-option=build_ext --global-option="-I/usr/include/gdal" python test_app.py From e20f00440c3de33dfe9295744cf68001e8f08d53 Mon Sep 17 00:00:00 2001 From: kshitijrajsharma Date: Thu, 15 Jun 2023 09:11:16 +0545 Subject: [PATCH 11/11] Resotored pandas version --- pyproject.toml | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 4ed3c2b3..1b6dcff8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -19,7 +19,7 @@ keywords = [ ] dependencies = [ "shapely==1.8.0", "GDAL", "numpy", - "Pillow==9.0.1", "geopandas==0.10.2","pandas==2.0.2", + "Pillow==9.0.1", "geopandas==0.10.2","pandas==1.5.3", "rasterio", "mercantile==1.2.1", "tqdm==4.62.3", "rtree", "opencv-python==4.5.5.64","ramp-fair==0.1.2" ] diff --git a/requirements.txt b/requirements.txt index 97fc1eca..0d49a92e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,7 @@ numpy gdal Pillow==9.0.1 geopandas==0.10.2 -pandas==2.0.2 +pandas==1.5.3 rasterio tqdm==4.62.3 Rtree