From 580aa764135032a0ffd211350b5a01f97d7ed771 Mon Sep 17 00:00:00 2001 From: Naman Nandan Date: Thu, 22 Jun 2023 17:33:52 -0700 Subject: [PATCH 1/6] Fix missing torchserve-plugins-sdk artifacts and version --- serving-sdk/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/serving-sdk/pom.xml b/serving-sdk/pom.xml index 93ed5ab070..104b24a73e 100644 --- a/serving-sdk/pom.xml +++ b/serving-sdk/pom.xml @@ -147,9 +147,9 @@ - bintray-pytorch-maven + central pytorch-maven - https://api.bintray.com/maven/pytorch/maven/org.pytorch:torchserve_plugins_sdk/ + https://repo1.maven.org/maven2/org/pytorch/torchserve_plugins_sdk/ From c91b19f61b7c815e7c713795c316a0d4a7bd43c2 Mon Sep 17 00:00:00 2001 From: Naman Nandan Date: Mon, 26 Jun 2023 15:25:48 -0700 Subject: [PATCH 2/6] Add support for releasing torchserve plugins sdk to Maven Central --- serving-sdk/pom.xml | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/serving-sdk/pom.xml b/serving-sdk/pom.xml index 104b24a73e..6ba9fc78ba 100644 --- a/serving-sdk/pom.xml +++ b/serving-sdk/pom.xml @@ -24,6 +24,12 @@ + + scm:git:git://github.com/pytorch/serve.git + scm:git:ssh://github.com:pytorch/serve.git + https://github.com/pytorch/serve + + http://maven.apache.org file://${project.build.directory}/repo @@ -142,14 +148,24 @@ 8 + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.13 + true + + ossrh + https://s01.oss.sonatype.org/ + true + + - - central - pytorch-maven - https://repo1.maven.org/maven2/org/pytorch/torchserve_plugins_sdk/ - + + ossrh + https://s01.oss.sonatype.org/content/repositories/snapshots + From c20c5dc6353be6a54e4df0c001ed0d344082d32a Mon Sep 17 00:00:00 2001 From: Naman Nandan Date: Tue, 27 Jun 2023 16:31:17 -0700 Subject: [PATCH 3/6] enable gpg signing --- serving-sdk/pom.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/serving-sdk/pom.xml b/serving-sdk/pom.xml index 6ba9fc78ba..437ee3c809 100644 --- a/serving-sdk/pom.xml +++ b/serving-sdk/pom.xml @@ -33,7 +33,7 @@ http://maven.apache.org file://${project.build.directory}/repo - true + false UTF-8 UTF-8 @@ -67,6 +67,8 @@ 1.6 ${skip.gpg} + ${gpg.keyname} + ${gpg.passphrase} From f228078e83aa0f1c0297d71a77b12e9c233ea64f Mon Sep 17 00:00:00 2001 From: Naman Nandan Date: Wed, 28 Jun 2023 10:44:38 -0700 Subject: [PATCH 4/6] Add necessary gpg arguments and update distribution management --- serving-sdk/pom.xml | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/serving-sdk/pom.xml b/serving-sdk/pom.xml index 437ee3c809..07ce573553 100644 --- a/serving-sdk/pom.xml +++ b/serving-sdk/pom.xml @@ -33,7 +33,7 @@ http://maven.apache.org file://${project.build.directory}/repo - false + true UTF-8 UTF-8 @@ -69,6 +69,10 @@ ${skip.gpg} ${gpg.keyname} ${gpg.passphrase} + + --pinentry-mode + loopback + @@ -120,7 +124,7 @@ attach-sources - jar + jar-no-fork @@ -157,8 +161,8 @@ true ossrh - https://s01.oss.sonatype.org/ - true + https://oss.sonatype.org/ + false @@ -167,7 +171,11 @@ ossrh - https://s01.oss.sonatype.org/content/repositories/snapshots + https://oss.sonatype.org/content/repositories/snapshots + + ossrh + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + From 151d8c9257f7eb88fe287365437f886ee9e3d799 Mon Sep 17 00:00:00 2001 From: Naman Nandan Date: Wed, 28 Jun 2023 14:25:03 -0700 Subject: [PATCH 5/6] Revert workaround used to build and install torchserve-plugins-sdk locally --- frontend/build.gradle | 2 -- ts_scripts/install_dependencies.py | 15 --------------- 2 files changed, 17 deletions(-) diff --git a/frontend/build.gradle b/frontend/build.gradle index ccda20960d..b01ab449b8 100644 --- a/frontend/build.gradle +++ b/frontend/build.gradle @@ -19,8 +19,6 @@ allprojects { repositories { mavenCentral() - jcenter() - mavenLocal() } apply plugin: 'idea' diff --git a/ts_scripts/install_dependencies.py b/ts_scripts/install_dependencies.py index 8bc949f185..b5b9b4b0a7 100644 --- a/ts_scripts/install_dependencies.py +++ b/ts_scripts/install_dependencies.py @@ -81,9 +81,6 @@ def install_wget(self): def install_numactl(self): pass - def install_torchserve_plugins_sdk(self): - pass - class Linux(Common): def __init__(self): @@ -113,9 +110,6 @@ def install_numactl(self): if os.system("numactl --show") != 0 or args.force: os.system(f"{self.sudo_cmd}apt-get install -y numactl") - def install_torchserve_plugins_sdk(self): - os.system(f"cd {REPO_ROOT}/serving-sdk/ && ./mvnw clean install -q && cd ../") - class Windows(Common): def __init__(self): @@ -134,11 +128,6 @@ def install_wget(self): def install_numactl(self): pass - def install_torchserve_plugins_sdk(self): - os.system( - f"cd {REPO_ROOT}/serving-sdk/ && .\mvnw.cmd clean install -q && cd ../" - ) - class Darwin(Common): def __init__(self): @@ -167,9 +156,6 @@ def install_numactl(self): if os.system("numactl --show") != 0 or args.force: os.system("brew install numactl") - def install_torchserve_plugins_sdk(self): - os.system(f"cd {REPO_ROOT}/serving-sdk/ && ./mvnw clean install -q && cd ../") - def install_dependencies(cuda_version=None, nightly=False): os_map = {"Linux": Linux, "Windows": Windows, "Darwin": Darwin} @@ -180,7 +166,6 @@ def install_dependencies(cuda_version=None, nightly=False): system.install_nodejs() system.install_node_packages() system.install_numactl() - system.install_torchserve_plugins_sdk() # Sequence of installation to be maintained system.install_java() From 35844b629504a42bfaedffd324ec1181087cccf0 Mon Sep 17 00:00:00 2001 From: Naman Nandan Date: Wed, 28 Jun 2023 14:35:34 -0700 Subject: [PATCH 6/6] Disable building torchserve-plugins-sdk in CI --- .github/workflows/ci_cpu.yml | 8 -------- .github/workflows/ci_gpu.yml | 3 --- 2 files changed, 11 deletions(-) diff --git a/.github/workflows/ci_cpu.yml b/.github/workflows/ci_cpu.yml index 1f7fd98ad6..c33d5d1c7b 100644 --- a/.github/workflows/ci_cpu.yml +++ b/.github/workflows/ci_cpu.yml @@ -43,14 +43,6 @@ jobs: retry_on: error command: | python torchserve_sanity.py - - name: mvn install - unix - if: matrix.os != 'windows-latest' - run: | - cd serving-sdk/ && ./mvnw clean install -q && cd ../ - - name: mvn install - windows - if: matrix.os == 'windows-latest' - run: | - cd serving-sdk/ && .\mvnw.cmd clean install -q && cd ../ # Any coverage.xml will be picked up by this step # Just make sure each coverage.xml is in a different folder - name: Upload codecov diff --git a/.github/workflows/ci_gpu.yml b/.github/workflows/ci_gpu.yml index e43e2b92f2..695c245c97 100644 --- a/.github/workflows/ci_gpu.yml +++ b/.github/workflows/ci_gpu.yml @@ -47,9 +47,6 @@ jobs: max_attempts: 3 command: | python torchserve_sanity.py - - name: mvn install - run: | - cd serving-sdk/ && ./mvnw clean install -q && cd ../ # Any coverage.xml will be picked up by this step # Just make sure each coverage.xml is in a different folder