Skip to content

Commit

Permalink
* Add presets for TensorRT
Browse files Browse the repository at this point in the history
  • Loading branch information
saudet committed Apr 4, 2018
1 parent 185d2a5 commit 551d81f
Show file tree
Hide file tree
Showing 17 changed files with 6,015 additions and 70 deletions.
4 changes: 4 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -637,6 +637,10 @@ matrix:
env: PROJ=tensorflow OS=linux-x86_64
install: true
script: ./ci/install-travis.sh
- os: linux
env: PROJ=tensorrt OS=linux-x86_64
install: true
script: ./ci/install-travis.sh
- os: linux
env: PROJ=ale OS=linux-x86_64
install: true
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@

* Add presets for TensorRT
* Fix build for FFmpeg on `android-x86` and `android-x86_64` platforms ([issue bytedeco/javacv#945](https://github.com/bytedeco/javacv/issues/945))
* Upgrade presets for TensorFlow 1.7.0

Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,10 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip
* Tesseract 3.05.01 https://github.com/tesseract-ocr/tesseract
* Caffe 1.0 https://github.com/BVLC/caffe
* CUDA 9.1 https://developer.nvidia.com/cuda-downloads
* cuDNN 7.1 https://developer.nvidia.com/cudnn
* MXnet 1.1.0 https://github.com/dmlc/mxnet
* TensorFlow 1.7.0 https://github.com/tensorflow/tensorflow
* TensorRT 4.0 https://developer.nvidia.com/tensorrt
* The Arcade Learning Environment 0.6.0 https://github.com/mgbellemare/Arcade-Learning-Environment
* LiquidFun http://google.github.io/liquidfun/
* Skia https://skia.org
Expand Down
11 changes: 7 additions & 4 deletions ci/install-travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ if [ "$TRAVIS_OS_NAME" == "osx" ]; then export JAVA_HOME=$(/usr/libexec/java_hom
if [[ "$OS" == "linux-x86" ]] || [[ "$OS" == "linux-x86_64" ]] || [[ "$OS" =~ android ]]; then
CENTOS_VERSION=6
SCL_ENABLE="rh-maven33 python27"
if [[ "librealsense chilitags llvm caffe mxnet tensorflow ale skia " =~ "$PROJ " ]] || [[ "$OS" =~ android ]]; then
if [[ "librealsense chilitags llvm caffe mxnet tensorflow tensorrt ale skia " =~ "$PROJ " ]] || [[ "$OS" =~ android ]]; then
CENTOS_VERSION=7
SCL_ENABLE="rh-maven33"
fi
Expand Down Expand Up @@ -80,11 +80,14 @@ if [[ "$OS" == "linux-x86" ]] || [[ "$OS" == "linux-x86_64" ]] || [[ "$OS" =~ an
echo "Download failed here, so can't proceed with the build.. Failing.."
exit 1
fi
docker exec -ti $DOCKER_CONTAINER_ID /bin/bash -xec "bash $HOME/downloads/bazel.sh"
fi
docker exec -ti $DOCKER_CONTAINER_ID /bin/bash -xec "bash $HOME/downloads/bazel.sh"
fi
if [ "$PROJ" == "tensorrt" ]; then
python $TRAVIS_BUILD_DIR/ci/gDownload.py 166ZMg_kQcOu3A57Y7L3mZ3lvhSxof-C2 $HOME/downloads/tensorrt.tar.gz
docker exec -ti $DOCKER_CONTAINER_ID /bin/bash -xec "tar xvf $HOME/downloads/tensorrt.tar.gz -C /usr/local/; ln -s /usr/local/TensorRT* /usr/local/tensorrt"
fi
fi


if [ "$OS" == "linux-armhf" ]; then
echo "Setting up tools for linux-armhf build"
sudo dpkg --add-architecture i386
Expand Down
66 changes: 0 additions & 66 deletions ci/settings.xml
Original file line number Diff line number Diff line change
@@ -1,70 +1,4 @@
<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
<profiles>
<profile>
<id>snapshots</id>
<repositories>
<repository>
<id>sonatype-nexus-snapshots</id>
<name>Sonatype Nexus Snapshots</name>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
<updatePolicy>never</updatePolicy>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>sonatype-nexus-snapshots</id>
<name>Sonatype Nexus Snapshots</name>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
<updatePolicy>never</updatePolicy>
</snapshots>
</pluginRepository>
</pluginRepositories>
</profile>
<profile>
<id>staging</id>
<repositories>
<repository>
<id>sonatype-nexus-staging</id>
<name>Sonatype Nexus Staging</name>
<url>https://oss.sonatype.org/service/local/staging/deployByRepositoryId/${env.STAGING_REPOSITORY}/</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>sonatype-nexus-staging</id>
<name>Sonatype Nexus Staging</name>
<url>https://oss.sonatype.org/service/local/staging/deployByRepositoryId/${env.STAGING_REPOSITORY}/</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
</profile>
</profiles>
<activeProfiles>
<activeProfile>snapshots</activeProfile>
<activeProfile>staging</activeProfile>
</activeProfiles>
<servers>
<server>
<id>sonatype-nexus-snapshots</id>
Expand Down
6 changes: 6 additions & 0 deletions platform/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
<module>../cuda/platform</module>
<module>../mxnet/platform</module>
<module>../tensorflow/platform</module>
<module>../tensorrt/platform</module>
<module>../ale/platform</module>
<module>../liquidfun/platform</module>
<module>../skia/platform</module>
Expand Down Expand Up @@ -184,6 +185,11 @@
<artifactId>tensorflow-platform</artifactId>
<version>1.7.0-${project.version}</version>
</dependency>
<dependency>
<groupId>org.bytedeco.javacpp-presets</groupId>
<artifactId>tensorrt-platform</artifactId>
<version>4.0-${project.version}</version>
</dependency>
<dependency>
<groupId>org.bytedeco.javacpp-presets</groupId>
<artifactId>ale-platform</artifactId>
Expand Down
28 changes: 28 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -462,6 +462,32 @@
<value>true</value>
</property>
</activation>
<repositories>
<repository>
<id>sonatype-nexus-staging</id>
<name>Sonatype Nexus Staging</name>
<url>https://oss.sonatype.org/service/local/staging/deployByRepositoryId/${stagingRepositoryId}/</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>sonatype-nexus-staging</id>
<name>Sonatype Nexus Staging</name>
<url>https://oss.sonatype.org/service/local/staging/deployByRepositoryId/${stagingRepositoryId}/</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
<build>
<plugins>
<plugin>
Expand Down Expand Up @@ -519,6 +545,7 @@
<module>cuda</module>
<module>mxnet</module>
<module>tensorflow</module>
<module>tensorrt</module>
<module>ale</module>
<module>liquidfun</module>
<module>skia</module>
Expand Down Expand Up @@ -1151,6 +1178,7 @@
<module>cuda</module>
<module>mxnet</module>
<module>tensorflow</module>
<module>tensorrt</module>
<module>ale</module>
<module>liquidfun</module>
<module>skia</module>
Expand Down
Loading

0 comments on commit 551d81f

Please sign in to comment.