Skip to content

Commit

Permalink
Update versions to 6.1. (#242)
Browse files Browse the repository at this point in the history
  • Loading branch information
jrobble authored Apr 5, 2021
1 parent 2d32fac commit 525d897
Show file tree
Hide file tree
Showing 29 changed files with 63 additions and 63 deletions.
4 changes: 2 additions & 2 deletions cpp/DarknetDetection/plugin-files/descriptor/descriptor.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"componentName": "DarknetDetection",
"componentVersion": "6.0",
"middlewareVersion": "6.0",
"componentVersion": "6.1",
"middlewareVersion": "6.1",
"sourceLanguage": "c++",
"batchLibrary": "${MPF_HOME}/plugins/DarknetDetection/lib/libmpfDarknetDetection.so",
"streamLibrary": "${MPF_HOME}/plugins/DarknetDetection/lib/libmpfDarknetStreamingDetection.so",
Expand Down
4 changes: 2 additions & 2 deletions cpp/DlibFaceDetection/plugin-files/descriptor/descriptor.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"componentName": "DlibFaceDetection",
"componentVersion": "6.0",
"middlewareVersion": "6.0",
"componentVersion": "6.1",
"middlewareVersion": "6.1",
"sourceLanguage": "c++",
"batchLibrary": "${MPF_HOME}/plugins/DlibFaceDetection/lib/libmpfDlibFaceDetection.so",
"environmentVariables": [
Expand Down
4 changes: 2 additions & 2 deletions cpp/KeywordTagging/plugin-files/descriptor/descriptor.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"componentName": "KeywordTagging",
"componentVersion": "6.0",
"middlewareVersion": "6.0",
"componentVersion": "6.1",
"middlewareVersion": "6.1",
"sourceLanguage": "c++",
"batchLibrary": "${MPF_HOME}/plugins/KeywordTagging/lib/libmpfKeywordTagging.so",
"environmentVariables": [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"componentName": "OalprLicensePlateTextDetection",
"componentVersion": "6.0",
"middlewareVersion": "6.0",
"componentVersion": "6.1",
"middlewareVersion": "6.1",
"sourceLanguage": "c++",
"setupFile": "setup/componentSetup.yml",
"batchLibrary": "${MPF_HOME}/plugins/OalprLicensePlateTextDetection/lib/libmpfOALPRLicensePlateTextDetection.so",
Expand Down
4 changes: 2 additions & 2 deletions cpp/OcvDnnDetection/plugin-files/descriptor/descriptor.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"componentName": "OcvDnnDetection",
"componentVersion": "6.0",
"middlewareVersion": "6.0",
"componentVersion": "6.1",
"middlewareVersion": "6.1",
"sourceLanguage": "c++",
"batchLibrary": "${MPF_HOME}/plugins/OcvDnnDetection/lib/libmpfOcvDnnDetection.so",
"environmentVariables": [
Expand Down
4 changes: 2 additions & 2 deletions cpp/OcvFaceDetection/plugin-files/descriptor/descriptor.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"componentName": "OcvFaceDetection",
"componentVersion": "6.0",
"middlewareVersion": "6.0",
"componentVersion": "6.1",
"middlewareVersion": "6.1",
"sourceLanguage": "c++",
"batchLibrary": "${MPF_HOME}/plugins/OcvFaceDetection/lib/libmpfOcvFaceDetection.so",
"environmentVariables": [
Expand Down
4 changes: 2 additions & 2 deletions cpp/OcvYoloDetection/plugin-files/descriptor/descriptor.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"componentName": "OcvYoloDetection",
"componentVersion": "6.0",
"middlewareVersion": "6.0",
"componentVersion": "6.1",
"middlewareVersion": "6.1",
"sourceLanguage": "c++",
"batchLibrary": "${MPF_HOME}/plugins/OcvYoloDetection/lib/libmpfOcvYoloDetection.so",
"environmentVariables": [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"componentName" : "SceneChangeDetection",
"componentVersion" : "6.0",
"middlewareVersion" : "6.0",
"componentVersion" : "6.1",
"middlewareVersion" : "6.1",
"sourceLanguage" : "c++",
"batchLibrary": "${MPF_HOME}/plugins/SceneChangeDetection/lib/libmpfSceneChange.so",
"environmentVariables" : [ {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"componentName": "TesseractOCRTextDetection",
"componentVersion": "6.0",
"middlewareVersion": "6.0",
"componentVersion": "6.1",
"middlewareVersion": "6.1",
"sourceLanguage": "c++",
"batchLibrary": "${MPF_HOME}/plugins/TesseractOCRTextDetection/lib/libmpfTesseractOCRTextDetection.so",
"environmentVariables": [
Expand Down
2 changes: 1 addition & 1 deletion cpp/TrtisDetection/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ ARG BUILD_REGISTRY
ARG BUILD_TAG=latest
ARG MODELS_REGISTRY=openmpf/

FROM ${MODELS_REGISTRY}openmpf_trtis_detection_models:6.0 as models
FROM ${MODELS_REGISTRY}openmpf_trtis_detection_models:6.1 as models


FROM ${BUILD_REGISTRY}openmpf_cpp_component_build:${BUILD_TAG} as build_component
Expand Down
4 changes: 2 additions & 2 deletions cpp/TrtisDetection/plugin-files/descriptor/descriptor.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"componentName": "TrtisDetection",
"componentVersion": "6.0",
"middlewareVersion": "6.0",
"componentVersion": "6.1",
"middlewareVersion": "6.1",
"sourceLanguage": "c++",
"batchLibrary": "${MPF_HOME}/plugins/TrtisDetection/lib/libmpfTrtisDetection.so",
"environmentVariables": [
Expand Down
2 changes: 1 addition & 1 deletion cpp/TrtisDetection/trtserver_dockerfile/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

ARG MODELS_REGISTRY=openmpf/

FROM ${MODELS_REGISTRY}openmpf_trtis_detection_models:6.0 as models
FROM ${MODELS_REGISTRY}openmpf_trtis_detection_models:6.1 as models


FROM nvcr.io/nvidia/tensorrtserver:19.04-py3 as openmpf_trtis_server
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"componentName": "SphinxSpeechDetection",
"componentVersion": "6.0",
"middlewareVersion": "6.0",
"componentVersion": "6.1",
"middlewareVersion": "6.1",
"sourceLanguage": "java",
"batchLibrary": "mpf-sphinx-speech-detection-component-6.0.jar",
"batchLibrary": "mpf-sphinx-speech-detection-component-6.1.jar",
"environmentVariables": [
{
"name": "LD_LIBRARY_PATH",
Expand Down
4 changes: 2 additions & 2 deletions java/SphinxSpeechDetection/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

<groupId>org.mitre.mpf</groupId>
<artifactId>mpf-sphinx-speech-detection-component</artifactId>
<version>6.0</version>
<version>6.1</version>

<properties>
<maven.compiler.source>11</maven.compiler.source>
Expand All @@ -44,7 +44,7 @@
<dependency>
<groupId>org.mitre.mpf</groupId>
<artifactId>mpf-java-component-api</artifactId>
<version>6.0</version>
<version>6.1</version>
</dependency>
<dependency>
<groupId>edu.cmu.sphinx</groupId>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"componentName" : "TikaImageDetection",
"componentVersion" : "6.0",
"middlewareVersion" : "6.0",
"componentVersion" : "6.1",
"middlewareVersion" : "6.1",
"sourceLanguage" : "java",
"batchLibrary" : "mpf-tika-image-detection-component-6.0.jar",
"batchLibrary" : "mpf-tika-image-detection-component-6.1.jar",
"environmentVariables" : [],
"algorithm" : {
"name": "TIKAIMAGE",
Expand Down
4 changes: 2 additions & 2 deletions java/TikaImageDetection/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@


<groupId>org.mitre.mpf</groupId>
<version>6.0</version>
<version>6.1</version>

<modelVersion>4.0.0</modelVersion>

Expand All @@ -49,7 +49,7 @@
<dependency>
<groupId>org.mitre.mpf</groupId>
<artifactId>mpf-java-component-api</artifactId>
<version>6.0</version>
<version>6.1</version>
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"componentName" : "TikaTextDetection",
"componentVersion" : "6.0",
"middlewareVersion" : "6.0",
"componentVersion" : "6.1",
"middlewareVersion" : "6.1",
"sourceLanguage" : "java",
"batchLibrary" : "mpf-tika-text-detection-component-6.0.jar",
"batchLibrary" : "mpf-tika-text-detection-component-6.1.jar",
"environmentVariables" : [],
"algorithm" : {
"name": "TIKATEXT",
Expand Down
4 changes: 2 additions & 2 deletions java/TikaTextDetection/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@


<groupId>org.mitre.mpf</groupId>
<version>6.0</version>
<version>6.1</version>

<modelVersion>4.0.0</modelVersion>

Expand All @@ -48,7 +48,7 @@
<dependency>
<groupId>org.mitre.mpf</groupId>
<artifactId>mpf-java-component-api</artifactId>
<version>6.0</version>
<version>6.1</version>
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
Expand Down
2 changes: 1 addition & 1 deletion java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

<groupId>org.mitre.mpf</groupId>
<artifactId>mpf-java-components</artifactId>
<version>6.0</version>
<version>6.1</version>
<modules>
<module>SphinxSpeechDetection</module>
<module>TikaImageDetection</module>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"componentName": "AzureFormDetection",
"componentVersion": "6.0",
"middlewareVersion": "6.0",
"componentVersion": "6.1",
"middlewareVersion": "6.1",
"sourceLanguage": "python",
"batchLibrary": "AzureFormDetection",
"environmentVariables": [],
Expand Down
6 changes: 3 additions & 3 deletions python/AzureFormDetection/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@

setuptools.setup(
name='AzureFormDetection',
version='6.0',
version='6.1',
packages=setuptools.find_packages(exclude=('*test*',)),
package_data={'': ['text-tags.json']},
install_requires=(
'mpf_component_api>=6.0',
'mpf_component_util>=6.0',
'mpf_component_api>=6.1',
'mpf_component_util>=6.1',
'opencv-python>=4.4.0',
'numpy>=1.11'
),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"componentName": "AzureOcrTextDetection",
"componentVersion": "6.0",
"middlewareVersion": "6.0",
"componentVersion": "6.1",
"middlewareVersion": "6.1",
"sourceLanguage": "python",
"batchLibrary": "AzureOcrTextDetection",
"environmentVariables": [],
Expand Down
6 changes: 3 additions & 3 deletions python/AzureOcrTextDetection/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@

setuptools.setup(
name='AzureOcrTextDetection',
version='6.0',
version='6.1',
packages=setuptools.find_packages(exclude=('*test*',)),
install_requires=(
'mpf_component_api>=6.0',
'mpf_component_util>=6.0',
'mpf_component_api>=6.1',
'mpf_component_util>=6.1',
'opencv-python>=4.4.0',
'numpy>=1.11'
),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"componentName": "AzureSpeechDetection",
"componentVersion": "6.0",
"middlewareVersion": "6.0",
"componentVersion": "6.1",
"middlewareVersion": "6.1",
"sourceLanguage": "python",
"batchLibrary": "AzureSpeechDetection",
"environmentVariables": [],
Expand Down
6 changes: 3 additions & 3 deletions python/AzureSpeechDetection/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@

setuptools.setup(
name='AzureSpeechDetection',
version='6.0',
version='6.1',
packages=setuptools.find_packages(exclude=('*test*',)),
install_requires=(
'mpf_component_api>=6.0',
'mpf_component_util>=6.0',
'mpf_component_api>=6.1',
'mpf_component_util>=6.1',
'azure-storage-blob>=12.3',
'python-dateutil'
),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"componentName": "AzureTranslation",
"componentVersion": "6.0",
"middlewareVersion": "6.0",
"componentVersion": "6.1",
"middlewareVersion": "6.1",
"sourceLanguage": "python",
"batchLibrary": "AzureTranslation",
"environmentVariables": [],
Expand Down
6 changes: 3 additions & 3 deletions python/AzureTranslation/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@

setuptools.setup(
name='AzureTranslation',
version='6.0',
version='6.1',
packages=setuptools.find_packages(exclude=('*test*',)),
package_data={'': ['text-tags.json']},
install_requires=(
'mpf_component_api>=6.0',
'mpf_component_util>=6.0',
'mpf_component_api>=6.1',
'mpf_component_util>=6.1',
),
entry_points={
'mpf.exported_component': 'component = acs_translation_component:AcsTranslationComponent'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"componentName": "EastTextDetection",
"componentVersion": "6.0",
"middlewareVersion": "6.0",
"componentVersion": "6.1",
"middlewareVersion": "6.1",
"sourceLanguage": "python",
"batchLibrary": "EastTextDetection",
"environmentVariables": [],
Expand Down
6 changes: 3 additions & 3 deletions python/EastTextDetection/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@

setuptools.setup(
name='EastTextDetection',
version='6.0',
version='6.1',
packages=setuptools.find_packages(exclude=('*test*',)),
package_data={'': ['east_resnet50.pb']},
install_requires=(
'mpf_component_api>=6.0',
'mpf_component_util>=6.0',
'mpf_component_api>=6.1',
'mpf_component_util>=6.1',
'opencv-python>=4.4.0',
),
entry_points={
Expand Down

0 comments on commit 525d897

Please sign in to comment.