From 57209153eb676f179b7699df20c034ff98ccd90f Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Thu, 16 May 2024 15:35:15 -0400 Subject: [PATCH 01/32] Update docker-publish.yaml --- .github/workflows/docker-publish.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-publish.yaml b/.github/workflows/docker-publish.yaml index 6457eed43..3fcd61300 100644 --- a/.github/workflows/docker-publish.yaml +++ b/.github/workflows/docker-publish.yaml @@ -3,7 +3,7 @@ name: Build and upload Docker on: push: branches: - - main + - Remove_CurvRank2_FinFindr tags: - v* schedule: @@ -24,7 +24,7 @@ jobs: - uses: actions/checkout@v2 if: github.event_name == 'schedule' with: - ref: main + ref: Remove_CurvRank2_FinFindr - uses: actions/checkout@v2 if: github.event_name != 'schedule' From 9f7a4c73ff833b9957a155c0dc6cb8c24aa185fd Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Thu, 16 May 2024 17:21:31 -0400 Subject: [PATCH 02/32] Update Dockerfile --- devops/Dockerfile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/devops/Dockerfile b/devops/Dockerfile index f99dcd68d..2d2f81c2d 100644 --- a/devops/Dockerfile +++ b/devops/Dockerfile @@ -4,14 +4,15 @@ ARG WBIA_PROVISION_IMAGE=wildme/wbia-provision:latest FROM ${WBIA_PROVISION_IMAGE} as org.wildme.wbia.latest # && cd /wbia/wbia-plugin-curvrank/wbia_curvrank_v2 \ +# && git reset --hard origin/main \ +# && git pull \ + # Grab latest code RUN set -ex \ && git config --global user.email "dev@wildme.org" \ && git config --global user.name "Wild Me" \ && find /wbia/wbia* -name '.git' -type d -print0 | xargs -0 -i /bin/bash -c \ 'cd {} && cd .. && echo $(pwd) && git reset --hard origin/main && git pull' \ - && git reset --hard origin/main \ - && git pull \ && cd /wbia/wbia-plugin-kaggle7/wbia_kaggle7 \ && git reset --hard origin/main \ && git pull \ @@ -139,6 +140,8 @@ RUN set -ex \ # && /virtualenv/env3/bin/python -c "import wbia_finfindr; from wbia_finfindr.__main__ import main; main()" \ # && /virtualenv/env3/bin/python -c "import wbia_curvrank_v2; from wbia_curvrank_v2._plugin import *" \ #&& /virtualenv/env3/bin/python -c "import wbia_finfindr; from wbia_finfindr._plugin import *" \ +# && /virtualenv/env3/bin/python -c "import wbia_whaleridgefindr; from wbia_whaleridgefindr._plugin import *" \ + RUN set -ex \ && mkdir -p /data \ @@ -148,7 +151,6 @@ RUN set -ex \ && /virtualenv/env3/bin/python -c "import wbia_pie_v2; from wbia_pie_v2.__main__ import main; main()" \ && /virtualenv/env3/bin/python -c "import wbia_blend; from wbia_blend._plugin import *" \ && /virtualenv/env3/bin/python -c "import wbia_orientation; from wbia_orientation.__main__ import main; main()" \ - && /virtualenv/env3/bin/python -c "import wbia_whaleridgefindr; from wbia_whaleridgefindr._plugin import *" \ && /virtualenv/env3/bin/python -c "import wbia_kaggle7; from wbia_kaggle7._plugin import *" \ && /virtualenv/env3/bin/python -c "import wbia_lca; from wbia_lca._plugin import *" \ && /virtualenv/env3/bin/python -c "import wbia_deepsense; from wbia_deepsense._plugin import *" \ From 9307ce004cf281e42ea273f96ed8c9ac149bbd3b Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Thu, 16 May 2024 21:36:44 -0400 Subject: [PATCH 03/32] Update install.ubuntu.sh --- devops/install.ubuntu.sh | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/devops/install.ubuntu.sh b/devops/install.ubuntu.sh index 142acbf36..bbba04548 100644 --- a/devops/install.ubuntu.sh +++ b/devops/install.ubuntu.sh @@ -192,17 +192,17 @@ git clone --branch develop https://github.com/WildMeOrg/wbia-deprecate-tpl-bramb git clone --branch develop https://github.com/WildMeOrg/wbia-deprecate-tpl-lightnet git clone --recursive --branch develop https://github.com/WildMeOrg/wbia-plugin-cnn.git git clone --branch develop https://github.com/WildMeOrg/wbia-plugin-flukematch.git -git clone --branch develop https://github.com/WildMeOrg/wbia-plugin-finfindr.git +#git clone --branch develop https://github.com/WildMeOrg/wbia-plugin-finfindr.git git clone --branch develop https://github.com/WildMeOrg/wbia-plugin-deepsense.git -git clone --branch develop https://github.com/WildMeOrg/wbia-plugin-whaleridgefindr.git +#git clone --branch develop https://github.com/WildMeOrg/wbia-plugin-whaleridgefindr.git git clone --branch develop https://github.com/WildMeOrg/wbia-plugin-pie.git git clone https://github.com/WildMeOrg/wbia-plugin-blend.git -cd ${CODE} -git clone --recursive --branch develop https://github.com/WildMeOrg/wbia-plugin-curvrank.git -cd wbia-plugin-curvrank/wbia_curvrank -git fetch origin -git checkout develop +#cd ${CODE} +#git clone --recursive --branch develop https://github.com/WildMeOrg/wbia-plugin-curvrank.git +#cd wbia-plugin-curvrank/wbia_curvrank +#git fetch origin +#git checkout develop cd ${CODE} git clone --recursive --branch develop https://github.com/WildMeOrg/wbia-plugin-kaggle7.git @@ -250,11 +250,11 @@ cd ${CODE}/wbia-plugin-pie cd ${CODE}/wbia-plugin-blend pip install --no-cache-dir -e . -cd ${CODE}/wbia-plugin-finfindr -pip install --no-cache-dir -e . +#cd ${CODE}/wbia-plugin-finfindr +#pip install --no-cache-dir -e . -cd ${CODE}/wbia-plugin-whaleridgefindr -pip install --no-cache-dir -e . +#cd ${CODE}/wbia-plugin-whaleridgefindr +#pip install --no-cache-dir -e . cd ${CODE}/wbia-plugin-deepsense pip install --no-cache-dir -e . @@ -269,9 +269,9 @@ cd ${CODE}/wbia-plugin-flukematch ./unix_build.sh pip install --no-cache-dir -e . -cd ${CODE}/wbia-plugin-curvrank -./unix_build.sh -pip install --no-cache-dir -e . +#cd ${CODE}/wbia-plugin-curvrank +#./unix_build.sh +#pip install --no-cache-dir -e . pip uninstall -y \ opencv-python \ @@ -316,9 +316,9 @@ python -c "import wbia_cnn; from wbia_cnn.__main__ import main; main()" python -c "import wbia_pie; from wbia_pie.__main__ import main; main()" python -c "import wbia_blend; from wbia_blend._plugin import *" python -c "import wbia_flukematch; from wbia_flukematch.plugin import *" -python -c "import wbia_curvrank; from wbia_curvrank._plugin import *" -python -c "import wbia_finfindr; from wbia_finfindr._plugin import *" -python -c "import wbia_whaleridgefindr; from wbia_whaleridgefindr._plugin import *" +#python -c "import wbia_curvrank; from wbia_curvrank._plugin import *" +#python -c "import wbia_finfindr; from wbia_finfindr._plugin import *" +#python -c "import wbia_whaleridgefindr; from wbia_whaleridgefindr._plugin import *" python -c "import wbia_kaggle7; from wbia_kaggle7._plugin import *" python -c "import wbia_deepsense; from wbia_deepsense._plugin import *" From cc783421bf225557f0faf7ab21acf66d410f6b0e Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Fri, 17 May 2024 10:09:06 -0400 Subject: [PATCH 04/32] Update Dockerfile --- devops/provision/Dockerfile | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/devops/provision/Dockerfile b/devops/provision/Dockerfile index 6fd420e56..f211a5648 100644 --- a/devops/provision/Dockerfile +++ b/devops/provision/Dockerfile @@ -37,11 +37,11 @@ RUN set -ex \ && cd /wbia \ && git clone https://github.com/WildMeOrg/wbia-plugin-orientation.git \ && git clone https://github.com/WildMeOrg/wbia-plugin-flukematch.git \ - && git clone https://github.com/WildMeOrg/wbia-plugin-finfindr.git \ + #&& git clone https://github.com/WildMeOrg/wbia-plugin-finfindr.git \ && git clone https://github.com/WildMeOrg/wbia-plugin-deepsense.git \ && git clone https://github.com/WildMeOrg/wbia-plugin-pie-v2.git \ && git clone https://github.com/WildMeOrg/wbia-plugin-miew-id.git \ - && git clone https://github.com/WildMeOrg/wbia-plugin-whaleridgefindr.git + #&& git clone https://github.com/WildMeOrg/wbia-plugin-whaleridgefindr.git RUN set -ex \ && cd /wbia \ @@ -51,12 +51,12 @@ RUN set -ex \ && git checkout main # Clone third-party WBIA plug-in repositories -RUN set -ex \ - && cd /wbia \ - && git clone --recursive https://github.com/WildMeOrg/wbia-plugin-curvrank.git \ - && cd /wbia/wbia-plugin-curvrank/wbia_curvrank_v2 \ - && git fetch origin \ - && git checkout main +#RUN set -ex \ +# && cd /wbia \ +# && git clone --recursive https://github.com/WildMeOrg/wbia-plugin-curvrank.git \ +# && cd /wbia/wbia-plugin-curvrank/wbia_curvrank_v2 \ +# && git fetch origin \ +# && git checkout main RUN set -ex \ && cd /wbia \ @@ -128,13 +128,13 @@ RUN /bin/bash -xc '. /virtualenv/env3/bin/activate \ && cd /wbia/wbia-plugin-blend \ && pip install --no-cache-dir -e .' -RUN /bin/bash -xc '. /virtualenv/env3/bin/activate \ - && cd /wbia/wbia-plugin-finfindr \ - && pip install --no-cache-dir -e .' +#RUN /bin/bash -xc '. /virtualenv/env3/bin/activate \ +# && cd /wbia/wbia-plugin-finfindr \ +# && pip install --no-cache-dir -e .' -RUN /bin/bash -xc '. /virtualenv/env3/bin/activate \ - && cd /wbia/wbia-plugin-whaleridgefindr \ - && pip install --no-cache-dir -e .' +#RUN /bin/bash -xc '. /virtualenv/env3/bin/activate \ + #&& cd /wbia/wbia-plugin-whaleridgefindr \ + #&& pip install --no-cache-dir -e .' RUN /bin/bash -xc '. /virtualenv/env3/bin/activate \ && cd /wbia/wbia-plugin-deepsense \ @@ -157,10 +157,10 @@ RUN /bin/bash -xc '. /virtualenv/env3/bin/activate \ && ./unix_build.sh \ && pip install --no-cache-dir -e .' -RUN /bin/bash -xc '. /virtualenv/env3/bin/activate \ - && cd /wbia/wbia-plugin-curvrank \ - && ./unix_build.sh \ - && pip install --no-cache-dir -e .' +#RUN /bin/bash -xc '. /virtualenv/env3/bin/activate \ +# && cd /wbia/wbia-plugin-curvrank \ +# && ./unix_build.sh \ +# && pip install --no-cache-dir -e .' # Ensure no previous or deprecated repositories are installed # Ensure that opencv-python is un-installed since we want to use our built version From cf1f133e6733a433352ac65bebf72bdfb1b73509 Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Fri, 17 May 2024 10:32:04 -0400 Subject: [PATCH 05/32] Update Dockerfile --- devops/provision/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devops/provision/Dockerfile b/devops/provision/Dockerfile index f211a5648..634202b4d 100644 --- a/devops/provision/Dockerfile +++ b/devops/provision/Dockerfile @@ -40,7 +40,7 @@ RUN set -ex \ #&& git clone https://github.com/WildMeOrg/wbia-plugin-finfindr.git \ && git clone https://github.com/WildMeOrg/wbia-plugin-deepsense.git \ && git clone https://github.com/WildMeOrg/wbia-plugin-pie-v2.git \ - && git clone https://github.com/WildMeOrg/wbia-plugin-miew-id.git \ + && git clone https://github.com/WildMeOrg/wbia-plugin-miew-id.git #&& git clone https://github.com/WildMeOrg/wbia-plugin-whaleridgefindr.git RUN set -ex \ From 5edc0fc96d6f7cc70d3f35f50bfda2180387a8cc Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Fri, 17 May 2024 23:16:27 -0400 Subject: [PATCH 06/32] Update build.txt --- requirements/build.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements/build.txt b/requirements/build.txt index 6e595fed0..6e6fcbe34 100644 --- a/requirements/build.txt +++ b/requirements/build.txt @@ -1,5 +1,6 @@ cmake==3.25.2 ninja==1.11.1 +pyproject-hooks!=1.1 fairseq==0.12.2 setuptools==59.5.0 setuptools_scm[toml]==6.3.2 From 98e4de2810b0a996736938973a640c034ad8afa7 Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Sat, 18 May 2024 00:08:56 -0400 Subject: [PATCH 07/32] Update deprecated.sh --- devops/_config/deprecated.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/devops/_config/deprecated.sh b/devops/_config/deprecated.sh index e61eb0834..b3e95c89e 100755 --- a/devops/_config/deprecated.sh +++ b/devops/_config/deprecated.sh @@ -16,9 +16,9 @@ git clone https://github.com/WildMeOrg/wbia-plugin-pie.git && cd /wbia/wbia-plugin-pie \ && /bin/bash run_developer_setup.sh' -/virtualenv/env3/bin/pip install --no-cache-dir \ - 'tensorflow-gpu==1.15.5' \ - 'keras==2.2.5' +#/virtualenv/env3/bin/pip install --no-cache-dir \ +# 'tensorflow-gpu==1.15.5' \ +# 'keras==2.2.5' /virtualenv/env3/bin/pip install --no-cache-dir --upgrade \ numpy From fef56e0f513bf9c6e07b4fd799da38297f4c2acf Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Sat, 18 May 2024 12:04:57 -0400 Subject: [PATCH 08/32] Update deprecated.sh --- devops/_config/deprecated.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/devops/_config/deprecated.sh b/devops/_config/deprecated.sh index b3e95c89e..1ab389c0e 100755 --- a/devops/_config/deprecated.sh +++ b/devops/_config/deprecated.sh @@ -16,9 +16,9 @@ git clone https://github.com/WildMeOrg/wbia-plugin-pie.git && cd /wbia/wbia-plugin-pie \ && /bin/bash run_developer_setup.sh' -#/virtualenv/env3/bin/pip install --no-cache-dir \ -# 'tensorflow-gpu==1.15.5' \ -# 'keras==2.2.5' +/virtualenv/env3/bin/pip install --no-cache-dir \ + 'tensorflow-gpu==1.15.4' \ + 'keras==2.2.5' /virtualenv/env3/bin/pip install --no-cache-dir --upgrade \ numpy From 53605083ca2c5b3cafff96312694805d7d751900 Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Sat, 18 May 2024 12:52:33 -0400 Subject: [PATCH 09/32] Update build.txt --- requirements/build.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/build.txt b/requirements/build.txt index 6e6fcbe34..152308ecb 100644 --- a/requirements/build.txt +++ b/requirements/build.txt @@ -2,7 +2,7 @@ cmake==3.25.2 ninja==1.11.1 pyproject-hooks!=1.1 fairseq==0.12.2 -setuptools==59.5.0 +setuptools setuptools_scm[toml]==6.3.2 wheel==0.38.4 pyhesaff==2.1.1 From 32e786192929168a9f3cecaec5d3e9fba46836d2 Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Sat, 18 May 2024 13:37:14 -0400 Subject: [PATCH 10/32] Update build.txt --- requirements/build.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/build.txt b/requirements/build.txt index 152308ecb..956f6cd60 100644 --- a/requirements/build.txt +++ b/requirements/build.txt @@ -2,7 +2,7 @@ cmake==3.25.2 ninja==1.11.1 pyproject-hooks!=1.1 fairseq==0.12.2 -setuptools +setuptools==58.2.0 setuptools_scm[toml]==6.3.2 wheel==0.38.4 pyhesaff==2.1.1 From 26be544423b747a1d506e5a45c010ff39bd5e957 Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Sat, 18 May 2024 14:26:40 -0400 Subject: [PATCH 11/32] Update Dockerfile --- devops/develop/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/devops/develop/Dockerfile b/devops/develop/Dockerfile index c1d2b985a..73f8e0f22 100644 --- a/devops/develop/Dockerfile +++ b/devops/develop/Dockerfile @@ -8,6 +8,7 @@ RUN /bin/bash -xc '. /virtualenv/env3/bin/activate \ && pip uninstall -y wildbook-ia \ && cd /wbia/wildbook-ia \ && /bin/bash run_developer_setup.sh \ + && pip install --upgrade pip setuptools-scm \ && pip install --no-cache-dir -r /wbia/wildbook-ia/requirements/tests.txt \ && pip install --no-cache-dir -r /wbia/wildbook-ia/requirements/runtime.txt \ && pip install --no-cache-dir -r /wbia/wildbook-ia/requirements/postgres.txt \ From b1c3953b25c6b86212acf0e8bda39bf294c3f48f Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Sat, 18 May 2024 14:28:48 -0400 Subject: [PATCH 12/32] Update build.txt --- requirements/build.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements/build.txt b/requirements/build.txt index 956f6cd60..813f39246 100644 --- a/requirements/build.txt +++ b/requirements/build.txt @@ -3,6 +3,5 @@ ninja==1.11.1 pyproject-hooks!=1.1 fairseq==0.12.2 setuptools==58.2.0 -setuptools_scm[toml]==6.3.2 wheel==0.38.4 pyhesaff==2.1.1 From 6b2e740153d8fd5f32605a760efdfbed86e7bc7f Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Sat, 18 May 2024 15:11:35 -0400 Subject: [PATCH 13/32] Update build.txt --- requirements/build.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/build.txt b/requirements/build.txt index 813f39246..31fbff34d 100644 --- a/requirements/build.txt +++ b/requirements/build.txt @@ -2,6 +2,6 @@ cmake==3.25.2 ninja==1.11.1 pyproject-hooks!=1.1 fairseq==0.12.2 -setuptools==58.2.0 +setuptools==65.0.1 wheel==0.38.4 pyhesaff==2.1.1 From c9ffb3ddbb304c0c55d6919ae603d78f5d321b1e Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Sat, 18 May 2024 15:12:00 -0400 Subject: [PATCH 14/32] Update build.txt --- requirements/build.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements/build.txt b/requirements/build.txt index 31fbff34d..4447f178f 100644 --- a/requirements/build.txt +++ b/requirements/build.txt @@ -1,6 +1,5 @@ cmake==3.25.2 ninja==1.11.1 -pyproject-hooks!=1.1 fairseq==0.12.2 setuptools==65.0.1 wheel==0.38.4 From 4eaea17bccec14a1eba16e26e7d690bc52cc23c1 Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Sat, 18 May 2024 15:53:41 -0400 Subject: [PATCH 15/32] Update install.ubuntu.sh setuptools version update --- devops/install.ubuntu.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devops/install.ubuntu.sh b/devops/install.ubuntu.sh index bbba04548..32855f59a 100644 --- a/devops/install.ubuntu.sh +++ b/devops/install.ubuntu.sh @@ -78,7 +78,7 @@ pip install --no-cache-dir --upgrade \ 'cmake!=3.18.2' \ ninja \ scikit-build \ - 'setuptools>=42' \ + 'setuptools==59.5.0' \ 'setuptools_scm[toml]>=3.4' \ cython==3.0.0 \ numpy \ From bf24f8e140bf16445d402e1b1e5821066ffdae30 Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Sat, 18 May 2024 15:55:37 -0400 Subject: [PATCH 16/32] Update deprecated.sh tf version update --- devops/_config/deprecated.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devops/_config/deprecated.sh b/devops/_config/deprecated.sh index 1ab389c0e..e61eb0834 100755 --- a/devops/_config/deprecated.sh +++ b/devops/_config/deprecated.sh @@ -17,7 +17,7 @@ git clone https://github.com/WildMeOrg/wbia-plugin-pie.git && /bin/bash run_developer_setup.sh' /virtualenv/env3/bin/pip install --no-cache-dir \ - 'tensorflow-gpu==1.15.4' \ + 'tensorflow-gpu==1.15.5' \ 'keras==2.2.5' /virtualenv/env3/bin/pip install --no-cache-dir --upgrade \ From f3ac0670c0d4aa23bcb87b3f1961a0897a79ae65 Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Sat, 18 May 2024 15:59:02 -0400 Subject: [PATCH 17/32] Update Dockerfile --- devops/base/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devops/base/Dockerfile b/devops/base/Dockerfile index fae5df939..765a75c4c 100644 --- a/devops/base/Dockerfile +++ b/devops/base/Dockerfile @@ -128,7 +128,7 @@ RUN set -ex \ cmake \ ninja \ scikit-build \ - setuptools \ + setuptools==59.5.0 \ setuptools_scm[toml] \ cython \ # Install handy developer tools From db24d08e629e9657a45430ef42d4baf230ccf303 Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Sat, 18 May 2024 18:26:38 -0400 Subject: [PATCH 18/32] Update Dockerfile --- devops/base/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/devops/base/Dockerfile b/devops/base/Dockerfile index 765a75c4c..a0454db5d 100644 --- a/devops/base/Dockerfile +++ b/devops/base/Dockerfile @@ -123,12 +123,12 @@ RUN set -ex \ RUN set -ex \ && /virtualenv/env3/bin/pip install --upgrade \ pip \ + && /virtualenv/env3/bin/pip install setuptools==59.5.0 \ && /virtualenv/env3/bin/pip install --upgrade \ # Install build requirements cmake \ ninja \ - scikit-build \ - setuptools==59.5.0 \ + scikit-build \ setuptools_scm[toml] \ cython \ # Install handy developer tools From af3e8bf7ead58abb60e00f97a2ca2794ced83c23 Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Sat, 18 May 2024 19:28:08 -0400 Subject: [PATCH 19/32] Update Dockerfile --- devops/base/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/devops/base/Dockerfile b/devops/base/Dockerfile index a0454db5d..6850c5398 100644 --- a/devops/base/Dockerfile +++ b/devops/base/Dockerfile @@ -124,10 +124,11 @@ RUN set -ex \ && /virtualenv/env3/bin/pip install --upgrade \ pip \ && /virtualenv/env3/bin/pip install setuptools==59.5.0 \ - && /virtualenv/env3/bin/pip install --upgrade \ + && /virtualenv/env3/bin/pip install \ # Install build requirements cmake \ ninja \ + setuptools==59.5.0 \ scikit-build \ setuptools_scm[toml] \ cython \ From 8a4249033a831bd5e096ce0387d8f3ee4423010a Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Sat, 18 May 2024 19:56:20 -0400 Subject: [PATCH 20/32] Update Dockerfile --- devops/base/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devops/base/Dockerfile b/devops/base/Dockerfile index 6850c5398..bd060a462 100644 --- a/devops/base/Dockerfile +++ b/devops/base/Dockerfile @@ -124,7 +124,7 @@ RUN set -ex \ && /virtualenv/env3/bin/pip install --upgrade \ pip \ && /virtualenv/env3/bin/pip install setuptools==59.5.0 \ - && /virtualenv/env3/bin/pip install \ + && /virtualenv/env3/bin/pip install --upgrade \ # Install build requirements cmake \ ninja \ From 93dc400dd364dd03b8f11445e9a628128f9e2e42 Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Sun, 19 May 2024 20:06:16 -0400 Subject: [PATCH 21/32] Update build.txt --- requirements/build.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/build.txt b/requirements/build.txt index 4447f178f..3ae5ae457 100644 --- a/requirements/build.txt +++ b/requirements/build.txt @@ -1,6 +1,6 @@ cmake==3.25.2 ninja==1.11.1 fairseq==0.12.2 -setuptools==65.0.1 +setuptools==59.8.0 wheel==0.38.4 pyhesaff==2.1.1 From f2c4d6592e01ea435fd613ba9313919c63eaf088 Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Sun, 19 May 2024 20:09:54 -0400 Subject: [PATCH 22/32] Update install.ubuntu.sh --- devops/install.ubuntu.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devops/install.ubuntu.sh b/devops/install.ubuntu.sh index 32855f59a..01fb237a8 100644 --- a/devops/install.ubuntu.sh +++ b/devops/install.ubuntu.sh @@ -78,7 +78,7 @@ pip install --no-cache-dir --upgrade \ 'cmake!=3.18.2' \ ninja \ scikit-build \ - 'setuptools==59.5.0' \ + 'setuptools==59.8.0' \ 'setuptools_scm[toml]>=3.4' \ cython==3.0.0 \ numpy \ From 00bb5fdfd984dc55d3f3c420ee596179ceb65358 Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Sun, 19 May 2024 20:37:00 -0400 Subject: [PATCH 23/32] Update build.txt --- requirements/build.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/build.txt b/requirements/build.txt index 3ae5ae457..6c2f31061 100644 --- a/requirements/build.txt +++ b/requirements/build.txt @@ -1,6 +1,6 @@ cmake==3.25.2 ninja==1.11.1 fairseq==0.12.2 -setuptools==59.8.0 +setuptools==59.5.0 wheel==0.38.4 pyhesaff==2.1.1 From 9ff3bf50c1f4de2bde1cfbfdebc089f5695e60ed Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Sun, 19 May 2024 20:41:41 -0400 Subject: [PATCH 24/32] Update install.ubuntu.sh --- devops/install.ubuntu.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devops/install.ubuntu.sh b/devops/install.ubuntu.sh index 01fb237a8..32855f59a 100644 --- a/devops/install.ubuntu.sh +++ b/devops/install.ubuntu.sh @@ -78,7 +78,7 @@ pip install --no-cache-dir --upgrade \ 'cmake!=3.18.2' \ ninja \ scikit-build \ - 'setuptools==59.8.0' \ + 'setuptools==59.5.0' \ 'setuptools_scm[toml]>=3.4' \ cython==3.0.0 \ numpy \ From 9359b355156db47dd4fd54a1e5481adef227462f Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Sun, 19 May 2024 20:48:00 -0400 Subject: [PATCH 25/32] Update _sql_helpers.py --- wbia/control/_sql_helpers.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wbia/control/_sql_helpers.py b/wbia/control/_sql_helpers.py index 4714eee96..0a8bb6816 100644 --- a/wbia/control/_sql_helpers.py +++ b/wbia/control/_sql_helpers.py @@ -18,7 +18,10 @@ def version_check(): r""" duct tape function to avoid the setup tools version issues """ - print("setuptools version:", setuptools.__version__) + try: + print("setuptools version:", setuptools.__version__) + except: + print("setuptools version - no able to fetch version") def compare_string_versions(a, b): From a89b6ba0afb2a1408edf33df1cdde9c2354e68cd Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Sun, 19 May 2024 21:17:07 -0400 Subject: [PATCH 26/32] Update _sql_helpers.py --- wbia/control/_sql_helpers.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wbia/control/_sql_helpers.py b/wbia/control/_sql_helpers.py index 0a8bb6816..17932d4c2 100644 --- a/wbia/control/_sql_helpers.py +++ b/wbia/control/_sql_helpers.py @@ -20,8 +20,8 @@ def version_check(): """ try: print("setuptools version:", setuptools.__version__) - except: - print("setuptools version - no able to fetch version") + except Exception as ex: + print("setuptools version - no able to fetch version", ex.message, ex.args) def compare_string_versions(a, b): From 74ddf696713f68cd6f5129dbd56fe7e06fd8058c Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Sun, 19 May 2024 22:50:40 -0400 Subject: [PATCH 27/32] Update docker-publish.yaml revernt back to the main branch --- .github/workflows/docker-publish.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-publish.yaml b/.github/workflows/docker-publish.yaml index 3fcd61300..6457eed43 100644 --- a/.github/workflows/docker-publish.yaml +++ b/.github/workflows/docker-publish.yaml @@ -3,7 +3,7 @@ name: Build and upload Docker on: push: branches: - - Remove_CurvRank2_FinFindr + - main tags: - v* schedule: @@ -24,7 +24,7 @@ jobs: - uses: actions/checkout@v2 if: github.event_name == 'schedule' with: - ref: Remove_CurvRank2_FinFindr + ref: main - uses: actions/checkout@v2 if: github.event_name != 'schedule' From 568ad921923760ed3bbaf5a67c1e1c440ed768d8 Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Tue, 28 May 2024 15:13:23 -0400 Subject: [PATCH 28/32] Update Dockerfile --- devops/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devops/Dockerfile b/devops/Dockerfile index 79adfe6f1..7e14349fd 100644 --- a/devops/Dockerfile +++ b/devops/Dockerfile @@ -152,7 +152,7 @@ RUN set -ex \ && /virtualenv/env3/bin/python -c "import wbia_pie_v2; from wbia_pie_v2.__main__ import main; main()" \ && /virtualenv/env3/bin/python -c "import wbia_blend; from wbia_blend._plugin import *" \ && /virtualenv/env3/bin/python -c "import wbia_orientation; from wbia_orientation.__main__ import main; main()" \ - + && /virtualenv/env3/bin/python -c "import wbia_whaleridgefindr; from wbia_whaleridgefindr._plugin import *" \ && /virtualenv/env3/bin/python -c "import wbia_kaggle7; from wbia_kaggle7._plugin import *" \ && /virtualenv/env3/bin/python -c "import wbia_lca; from wbia_lca._plugin import *" \ && /virtualenv/env3/bin/python -c "import wbia_deepsense; from wbia_deepsense._plugin import *" \ From db73f67dc62ea2d0e66bfe9b02d4b4aa01c8e4e5 Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Tue, 28 May 2024 15:15:05 -0400 Subject: [PATCH 29/32] Update install.ubuntu.sh --- devops/install.ubuntu.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/devops/install.ubuntu.sh b/devops/install.ubuntu.sh index 32855f59a..8e2eadae6 100644 --- a/devops/install.ubuntu.sh +++ b/devops/install.ubuntu.sh @@ -194,7 +194,7 @@ git clone --recursive --branch develop https://github.com/WildMeOrg/wbia-plugin- git clone --branch develop https://github.com/WildMeOrg/wbia-plugin-flukematch.git #git clone --branch develop https://github.com/WildMeOrg/wbia-plugin-finfindr.git git clone --branch develop https://github.com/WildMeOrg/wbia-plugin-deepsense.git -#git clone --branch develop https://github.com/WildMeOrg/wbia-plugin-whaleridgefindr.git +git clone --branch develop https://github.com/WildMeOrg/wbia-plugin-whaleridgefindr.git git clone --branch develop https://github.com/WildMeOrg/wbia-plugin-pie.git git clone https://github.com/WildMeOrg/wbia-plugin-blend.git @@ -253,8 +253,8 @@ pip install --no-cache-dir -e . #cd ${CODE}/wbia-plugin-finfindr #pip install --no-cache-dir -e . -#cd ${CODE}/wbia-plugin-whaleridgefindr -#pip install --no-cache-dir -e . +cd ${CODE}/wbia-plugin-whaleridgefindr +pip install --no-cache-dir -e . cd ${CODE}/wbia-plugin-deepsense pip install --no-cache-dir -e . @@ -318,7 +318,7 @@ python -c "import wbia_blend; from wbia_blend._plugin import *" python -c "import wbia_flukematch; from wbia_flukematch.plugin import *" #python -c "import wbia_curvrank; from wbia_curvrank._plugin import *" #python -c "import wbia_finfindr; from wbia_finfindr._plugin import *" -#python -c "import wbia_whaleridgefindr; from wbia_whaleridgefindr._plugin import *" +python -c "import wbia_whaleridgefindr; from wbia_whaleridgefindr._plugin import *" python -c "import wbia_kaggle7; from wbia_kaggle7._plugin import *" python -c "import wbia_deepsense; from wbia_deepsense._plugin import *" From b3b183d67616d79a0e52e9bd9994eba7dafa1f59 Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Tue, 28 May 2024 15:16:40 -0400 Subject: [PATCH 30/32] Update Dockerfile --- devops/provision/Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/devops/provision/Dockerfile b/devops/provision/Dockerfile index 634202b4d..0f4e43d22 100644 --- a/devops/provision/Dockerfile +++ b/devops/provision/Dockerfile @@ -40,8 +40,8 @@ RUN set -ex \ #&& git clone https://github.com/WildMeOrg/wbia-plugin-finfindr.git \ && git clone https://github.com/WildMeOrg/wbia-plugin-deepsense.git \ && git clone https://github.com/WildMeOrg/wbia-plugin-pie-v2.git \ - && git clone https://github.com/WildMeOrg/wbia-plugin-miew-id.git - #&& git clone https://github.com/WildMeOrg/wbia-plugin-whaleridgefindr.git + && git clone https://github.com/WildMeOrg/wbia-plugin-miew-id.git \ + && git clone https://github.com/WildMeOrg/wbia-plugin-whaleridgefindr.git RUN set -ex \ && cd /wbia \ @@ -132,9 +132,9 @@ RUN /bin/bash -xc '. /virtualenv/env3/bin/activate \ # && cd /wbia/wbia-plugin-finfindr \ # && pip install --no-cache-dir -e .' -#RUN /bin/bash -xc '. /virtualenv/env3/bin/activate \ - #&& cd /wbia/wbia-plugin-whaleridgefindr \ - #&& pip install --no-cache-dir -e .' +RUN /bin/bash -xc '. /virtualenv/env3/bin/activate \ + && cd /wbia/wbia-plugin-whaleridgefindr \ + && pip install --no-cache-dir -e .' RUN /bin/bash -xc '. /virtualenv/env3/bin/activate \ && cd /wbia/wbia-plugin-deepsense \ From a01567fe2334222d38ac7985fd8c9a074b82db71 Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Tue, 28 May 2024 15:35:34 -0400 Subject: [PATCH 31/32] Update docker-publish.yaml --- .github/workflows/docker-publish.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-publish.yaml b/.github/workflows/docker-publish.yaml index 6457eed43..3fcd61300 100644 --- a/.github/workflows/docker-publish.yaml +++ b/.github/workflows/docker-publish.yaml @@ -3,7 +3,7 @@ name: Build and upload Docker on: push: branches: - - main + - Remove_CurvRank2_FinFindr tags: - v* schedule: @@ -24,7 +24,7 @@ jobs: - uses: actions/checkout@v2 if: github.event_name == 'schedule' with: - ref: main + ref: Remove_CurvRank2_FinFindr - uses: actions/checkout@v2 if: github.event_name != 'schedule' From bd6a271355c00eba02ae9d503e95ba8672c37da6 Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Tue, 28 May 2024 16:38:18 -0400 Subject: [PATCH 32/32] Update docker-publish.yaml --- .github/workflows/docker-publish.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-publish.yaml b/.github/workflows/docker-publish.yaml index 3fcd61300..6457eed43 100644 --- a/.github/workflows/docker-publish.yaml +++ b/.github/workflows/docker-publish.yaml @@ -3,7 +3,7 @@ name: Build and upload Docker on: push: branches: - - Remove_CurvRank2_FinFindr + - main tags: - v* schedule: @@ -24,7 +24,7 @@ jobs: - uses: actions/checkout@v2 if: github.event_name == 'schedule' with: - ref: Remove_CurvRank2_FinFindr + ref: main - uses: actions/checkout@v2 if: github.event_name != 'schedule'