diff options
author | Arne Juul <arnej@yahooinc.com> | 2022-12-01 21:35:01 +0000 |
---|---|---|
committer | Arne Juul <arnej@yahooinc.com> | 2022-12-02 14:46:10 +0000 |
commit | 2348208f249f0f56eb73a4c4066422e6c88516d8 (patch) | |
tree | d6e1af4c63e2b993421469aefb31bb47f71d5f2c | |
parent | d9ab932c59cf1d22f22c19b96619024a76aecc32 (diff) |
rename to just "container-onnxruntime"
-rw-r--r-- | CMakeLists.txt | 2 | ||||
-rw-r--r-- | cloud-tenant-base-dependencies-enforcer/pom.xml | 2 | ||||
-rw-r--r-- | config-model/pom.xml | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/ContainerModelEvaluation.java | 2 | ||||
-rw-r--r-- | container-dev/pom.xml | 2 | ||||
-rw-r--r-- | container-onnxruntime/.gitignore | 1 | ||||
-rw-r--r-- | container-onnxruntime/CMakeLists.txt (renamed from container-onnxruntime-bundle/CMakeLists.txt) | 2 | ||||
-rw-r--r-- | container-onnxruntime/README.md (renamed from container-onnxruntime-bundle/README.md) | 2 | ||||
-rw-r--r-- | container-onnxruntime/pom.xml (renamed from container-onnxruntime-bundle/pom.xml) | 4 | ||||
-rw-r--r-- | container-onnxruntime/src/main/java/ai/onnxruntime/package-info.java (renamed from container-onnxruntime-bundle/src/main/java/ai/onnxruntime/package-info.java) | 0 | ||||
-rw-r--r-- | container-onnxruntime/src/main/java/ai/onnxruntime/providers/package-info.java (renamed from container-onnxruntime-bundle/src/main/java/ai/onnxruntime/providers/package-info.java) | 0 | ||||
-rw-r--r-- | container-onnxruntime/src/main/java/ai/vespa/onnxruntime/OnnxBundleActivator.java (renamed from container-onnxruntime-bundle/src/main/java/ai/onnxruntime/vespa/OnnxBundleActivator.java) | 5 | ||||
-rw-r--r-- | container-onnxruntime/src/main/javadoc/README (renamed from container-onnxruntime-bundle/src/main/javadoc/README) | 0 | ||||
-rw-r--r-- | dist/vespa.spec | 2 | ||||
-rw-r--r-- | model-evaluation/pom.xml | 2 | ||||
-rw-r--r-- | model-integration/pom.xml | 2 | ||||
-rw-r--r-- | pom.xml | 2 | ||||
-rw-r--r-- | standalone-container/pom.xml | 2 |
18 files changed, 18 insertions, 16 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2db91166c77..c9d7154f9f1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -88,7 +88,7 @@ add_subdirectory(container-apache-http-client-bundle) add_subdirectory(container-core) add_subdirectory(container-disc) add_subdirectory(container-messagebus) -add_subdirectory(container-onnxruntime-bundle) +add_subdirectory(container-onnxruntime) add_subdirectory(container-search) add_subdirectory(container-search-and-docproc) add_subdirectory(container-spifly) diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml index 93062c3c037..9a640966f6d 100644 --- a/cloud-tenant-base-dependencies-enforcer/pom.xml +++ b/cloud-tenant-base-dependencies-enforcer/pom.xml @@ -116,7 +116,7 @@ <include>com.yahoo.vespa:container-disc:*:provided</include> <include>com.yahoo.vespa:container-documentapi:*:provided</include> <include>com.yahoo.vespa:container-messagebus:*:provided</include> - <include>com.yahoo.vespa:container-onnxruntime-bundle:*:provided</include> + <include>com.yahoo.vespa:container-onnxruntime:*:provided</include> <include>com.yahoo.vespa:container-search-and-docproc:*:provided</include> <include>com.yahoo.vespa:container-search:*:provided</include> <include>com.yahoo.vespa:container:*:provided</include> diff --git a/config-model/pom.xml b/config-model/pom.xml index 6da8ff5a868..46f7efa20d9 100644 --- a/config-model/pom.xml +++ b/config-model/pom.xml @@ -165,7 +165,7 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>container-onnxruntime-bundle</artifactId> + <artifactId>container-onnxruntime</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerModelEvaluation.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerModelEvaluation.java index b581ba1fc45..49292bd6df7 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerModelEvaluation.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerModelEvaluation.java @@ -28,7 +28,7 @@ public class ContainerModelEvaluation implements private final static String EVALUATION_BUNDLE_NAME = "model-evaluation"; private final static String INTEGRATION_BUNDLE_NAME = "model-integration"; - private final static String ONNXRUNTIME_BUNDLE_NAME = "container-onnxruntime-bundle.jar"; + private final static String ONNXRUNTIME_BUNDLE_NAME = "container-onnxruntime.jar"; private final static String EVALUATOR_NAME = ModelsEvaluator.class.getName(); private final static String REST_HANDLER_NAME = "ai.vespa.models.handler.ModelsEvaluationHandler"; diff --git a/container-dev/pom.xml b/container-dev/pom.xml index d016f05b6e2..e088c40e20b 100644 --- a/container-dev/pom.xml +++ b/container-dev/pom.xml @@ -80,7 +80,7 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>container-onnxruntime-bundle</artifactId> + <artifactId>container-onnxruntime</artifactId> <version>${project.version}</version> <exclusions> <exclusion> diff --git a/container-onnxruntime/.gitignore b/container-onnxruntime/.gitignore new file mode 100644 index 00000000000..916e17c097a --- /dev/null +++ b/container-onnxruntime/.gitignore @@ -0,0 +1 @@ +dependency-reduced-pom.xml diff --git a/container-onnxruntime-bundle/CMakeLists.txt b/container-onnxruntime/CMakeLists.txt index f19909e8165..4eff1d26e60 100644 --- a/container-onnxruntime-bundle/CMakeLists.txt +++ b/container-onnxruntime/CMakeLists.txt @@ -1,2 +1,2 @@ # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -install_jar(container-onnxruntime-bundle.jar) +install_jar(container-onnxruntime.jar) diff --git a/container-onnxruntime-bundle/README.md b/container-onnxruntime/README.md index 182695f0023..ef332b88ba7 100644 --- a/container-onnxruntime-bundle/README.md +++ b/container-onnxruntime/README.md @@ -1,4 +1,4 @@ <!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> -# container-onnxruntime-bundle +# container-onnxruntime onnxruntime.ai repackaged as a bundle diff --git a/container-onnxruntime-bundle/pom.xml b/container-onnxruntime/pom.xml index eca7aecf343..854a4571028 100644 --- a/container-onnxruntime-bundle/pom.xml +++ b/container-onnxruntime/pom.xml @@ -5,7 +5,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <artifactId>container-onnxruntime-bundle</artifactId> + <artifactId>container-onnxruntime</artifactId> <packaging>container-plugin</packaging> <version>8-SNAPSHOT</version> <parent> @@ -73,7 +73,7 @@ <transformers> <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> <manifestEntries> - <Bundle-Activator>ai.onnxruntime.vespa.OnnxBundleActivator</Bundle-Activator> + <Bundle-Activator>ai.vespa.onnxruntime.OnnxBundleActivator</Bundle-Activator> </manifestEntries> </transformer> </transformers> diff --git a/container-onnxruntime-bundle/src/main/java/ai/onnxruntime/package-info.java b/container-onnxruntime/src/main/java/ai/onnxruntime/package-info.java index 8b4b7369115..8b4b7369115 100644 --- a/container-onnxruntime-bundle/src/main/java/ai/onnxruntime/package-info.java +++ b/container-onnxruntime/src/main/java/ai/onnxruntime/package-info.java diff --git a/container-onnxruntime-bundle/src/main/java/ai/onnxruntime/providers/package-info.java b/container-onnxruntime/src/main/java/ai/onnxruntime/providers/package-info.java index af09aa01661..af09aa01661 100644 --- a/container-onnxruntime-bundle/src/main/java/ai/onnxruntime/providers/package-info.java +++ b/container-onnxruntime/src/main/java/ai/onnxruntime/providers/package-info.java diff --git a/container-onnxruntime-bundle/src/main/java/ai/onnxruntime/vespa/OnnxBundleActivator.java b/container-onnxruntime/src/main/java/ai/vespa/onnxruntime/OnnxBundleActivator.java index e6a93c73d99..6995c28b124 100644 --- a/container-onnxruntime-bundle/src/main/java/ai/onnxruntime/vespa/OnnxBundleActivator.java +++ b/container-onnxruntime/src/main/java/ai/vespa/onnxruntime/OnnxBundleActivator.java @@ -1,12 +1,13 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package ai.onnxruntime.vespa; +package ai.vespa.onnxruntime; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; import java.util.logging.Logger; -/** * @author arnej +/** + * @author arnej * Loads native libraries when the bundle is activated. * Use system properties to ensure onnxruntime won't try * to load them itself. diff --git a/container-onnxruntime-bundle/src/main/javadoc/README b/container-onnxruntime/src/main/javadoc/README index 97109fa2cc5..97109fa2cc5 100644 --- a/container-onnxruntime-bundle/src/main/javadoc/README +++ b/container-onnxruntime/src/main/javadoc/README diff --git a/dist/vespa.spec b/dist/vespa.spec index c58516a9ed8..fc965a3166c 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -778,7 +778,7 @@ fi %{_prefix}/lib/jars/config-provisioning-jar-with-dependencies.jar %{_prefix}/lib/jars/container-apache-http-client-bundle-jar-with-dependencies.jar %{_prefix}/lib/jars/container-disc-jar-with-dependencies.jar -%{_prefix}/lib/jars/container-onnxruntime-bundle.jar +%{_prefix}/lib/jars/container-onnxruntime.jar %{_prefix}/lib/jars/container-search-and-docproc-jar-with-dependencies.jar %{_prefix}/lib/jars/container-spifly.jar %{_prefix}/lib/jars/docprocs-jar-with-dependencies.jar diff --git a/model-evaluation/pom.xml b/model-evaluation/pom.xml index 444595bd000..7c2ee046556 100644 --- a/model-evaluation/pom.xml +++ b/model-evaluation/pom.xml @@ -75,7 +75,7 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>container-onnxruntime-bundle</artifactId> + <artifactId>container-onnxruntime</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> diff --git a/model-integration/pom.xml b/model-integration/pom.xml index d2d547bce86..43f24301d9a 100644 --- a/model-integration/pom.xml +++ b/model-integration/pom.xml @@ -53,7 +53,7 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>container-onnxruntime-bundle</artifactId> + <artifactId>container-onnxruntime</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> @@ -58,7 +58,7 @@ <module>container-disc</module> <module>container-documentapi</module> <module>container-messagebus</module> - <module>container-onnxruntime-bundle</module> + <module>container-onnxruntime</module> <module>container-search-and-docproc</module> <module>container-search</module> <module>container-spifly</module> diff --git a/standalone-container/pom.xml b/standalone-container/pom.xml index 5dad287ab97..805a318e6ed 100644 --- a/standalone-container/pom.xml +++ b/standalone-container/pom.xml @@ -112,7 +112,7 @@ linguistics-components-jar-with-dependencies.jar, model-evaluation-jar-with-dependencies.jar, model-integration-jar-with-dependencies.jar, - container-onnxruntime-bundle.jar, + container-onnxruntime.jar, <!-- END config-model dependencies --> </discPreInstallBundle> </configuration> |