Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename the artifact IDs for TensorFlow ecosystem jars #21770

Merged
merged 1 commit into from
Aug 22, 2018
Merged

Rename the artifact IDs for TensorFlow ecosystem jars #21770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions tensorflow/java/maven/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
<module>libtensorflow_jni_gpu</module>
<module>tensorflow</module>
<module>proto</module>
<module>hadoop</module>
<module>spark-connector</module>
<module>tensorflow-hadoop</module>
<module>spark-tensorflow-connector</module>
</modules>

<!-- Two profiles are used:
Expand Down
6 changes: 3 additions & 3 deletions tensorflow/java/maven/run_inside_container.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ clean() {
mvn -q clean
rm -rf libtensorflow_jni/src libtensorflow_jni/target libtensorflow_jni_gpu/src libtensorflow_jni_gpu/target \
libtensorflow/src libtensorflow/target tensorflow-android/target proto/src proto/target \
hadoop/src hadoop/target spark-connector/src spark-connector/target
tensorflow-hadoop/src tensorflow-hadoop/target spark-tensorflow-connector/src spark-tensorflow-connector/target
}

update_version_in_pom() {
Expand Down Expand Up @@ -170,8 +170,8 @@ generate_java_protos() {
# is updated for each module.
download_tf_ecosystem() {
ECOSYSTEM_DIR="/tmp/tensorflow-ecosystem"
HADOOP_DIR="${DIR}/hadoop"
SPARK_DIR="${DIR}/spark-connector"
HADOOP_DIR="${DIR}/tensorflow-hadoop"
SPARK_DIR="${DIR}/spark-tensorflow-connector"

# Clean any previous attempts
rm -rf "${ECOSYSTEM_DIR}"
Expand Down
6 changes: 3 additions & 3 deletions ...orflow/java/maven/spark-connector/pom.xml → .../maven/spark-tensorflow-connector/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,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>
<groupId>org.tensorflow</groupId>
<artifactId>spark-connector_2.11</artifactId>
<artifactId>spark-tensorflow-connector_2.11</artifactId>
<packaging>jar</packaging>
<version>1.10.0</version>
<name>spark-tensorflow-connector</name>
Expand Down Expand Up @@ -120,7 +120,7 @@
<artifactSet>
<includes>
<include>com.google.protobuf:protobuf-java</include>
<include>org.tensorflow:hadoop</include>
<include>org.tensorflow:tensorflow-hadoop</include>
<include>org.tensorflow:proto</include>
</includes>
</artifactSet>
Expand Down Expand Up @@ -305,7 +305,7 @@
<dependencies>
<dependency>
<groupId>org.tensorflow</groupId>
<artifactId>hadoop</artifactId>
<artifactId>tensorflow-hadoop</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions tensorflow/java/maven/hadoop/pom.xml → ...flow/java/maven/tensorflow-hadoop/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.tensorflow</groupId>
<artifactId>hadoop</artifactId>
<artifactId>tensorflow-hadoop</artifactId>
<packaging>jar</packaging>
<version>1.10.0</version>
<name>tensorflow-hadoop</name>
Expand All @@ -15,7 +15,7 @@
<maven.compiler.source>1.6</maven.compiler.source>
<maven.compiler.target>1.6</maven.compiler.target>
<hadoop.version>2.6.0</hadoop.version>
<protobuf.version>3.3.1</protobuf.version>
<protobuf.version>3.5.1</protobuf.version>
<junit.version>4.11</junit.version>
</properties>

Expand Down