Skip to content

Commit 140dd11

Browse files
agibsoncccagibsonccc
authored
Merge pull request #1026 from eclipse/ag_beta7_revert
Revert examples back to beta7
2 parents 1983138 + abc7743 commit 140dd11

File tree

10 files changed

+391
-313
lines changed

10 files changed

+391
-313
lines changed

‎android-examples/app/build.gradle

+9-10
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ android {
2727
}
2828

2929
dependencies {
30-
def dl4jVersion = '1.0.0-SNAPSHOT'
31-
def openblasVersion = '0.3.10-1.5.5'
32-
def opencvVersion = '4.5.1-1.5.5'
33-
def leptonicaVersion = '1.80.0-1.5.5'
30+
def dl4jVersion = '1.0.0-beta7'
31+
def openblasVersion = '0.3.9-1.5.3'
32+
def opencvVersion = '4.3.0-1.5.3'
33+
def leptonicaVersion = '1.79.0-1.5.3'
3434

3535
implementation fileTree(dir: 'libs', include: ['*.jar'])
3636

@@ -45,14 +45,13 @@ dependencies {
4545
exclude group: 'org.bytedeco', module: 'leptonica-platform'
4646
exclude group: 'org.bytedeco', module: 'hdf5-platform'
4747
exclude group: 'org.nd4j', module: 'nd4j-base64'
48-
exclude group: 'org.nd4j', module: 'nd4j-api'
4948
}
5049

5150
implementation group: 'org.nd4j', name: 'nd4j-native', version: dl4jVersion
52-
implementation group: 'org.nd4j', name: 'nd4j-native', version: dl4jVersion, classifier: "android-arm"
53-
implementation group: 'org.nd4j', name: 'nd4j-native', version: dl4jVersion, classifier: "android-arm64"
54-
implementation group: 'org.nd4j', name: 'nd4j-native', version: dl4jVersion, classifier: "android-x86"
55-
implementation group: 'org.nd4j', name: 'nd4j-native', version: dl4jVersion, classifier: "android-x86_64"
51+
implementation group: 'org.nd4j', name: 'nd4j-native', version: dl4jVersion, classifier: "android-arm"
52+
implementation group: 'org.nd4j', name: 'nd4j-native', version: dl4jVersion, classifier: "android-arm64"
53+
implementation group: 'org.nd4j', name: 'nd4j-native', version: dl4jVersion, classifier: "android-x86"
54+
implementation group: 'org.nd4j', name: 'nd4j-native', version: dl4jVersion, classifier: "android-x86_64"
5655
implementation group: 'org.bytedeco', name: 'openblas', version: openblasVersion
5756
implementation group: 'org.bytedeco', name: 'openblas', version: openblasVersion, classifier: "android-arm"
5857
implementation group: 'org.bytedeco', name: 'openblas', version: openblasVersion, classifier: "android-arm64"
@@ -70,4 +69,4 @@ dependencies {
7069
implementation group: 'org.bytedeco', name: 'leptonica', version: leptonicaVersion, classifier: "android-x86_64"
7170

7271
annotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.4'
73-
}
72+
}

‎cuda-specific-examples/pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
<version>1.0.0-beta7</version>
2626
<name>DeepLearning4j CUDA special examples</name>
2727
<properties>
28-
<dl4j-master.version>1.0.0-SNAPSHOT</dl4j-master.version>
29-
<nd4j.backend>nd4j-cuda-11.2</nd4j.backend>
28+
<dl4j-master.version>1.0.0-beta7</dl4j-master.version>
29+
<nd4j.backend>nd4j-cuda-10.2</nd4j.backend>
3030
<java.version>1.8</java.version>
3131
<exec-maven-plugin.version>1.4.0</exec-maven-plugin.version>
3232
<maven-shade-plugin.version>2.4.3</maven-shade-plugin.version>
@@ -39,12 +39,12 @@
3939
<dependencies>
4040
<dependency>
4141
<groupId>org.nd4j</groupId>
42-
<artifactId>nd4j-cuda-11.2</artifactId>
42+
<artifactId>nd4j-cuda-10.2</artifactId>
4343
<version>${dl4j-master.version}</version>
4444
</dependency>
4545
<dependency>
4646
<groupId>org.nd4j</groupId>
47-
<artifactId>nd4j-cuda-11.2</artifactId>
47+
<artifactId>nd4j-cuda-10.2</artifactId>
4848
<version>${dl4j-master.version}</version>
4949
</dependency>
5050
<dependency>

‎data-pipeline-examples/pom.xml

+109-131
Original file line numberDiff line numberDiff line change
@@ -22,28 +22,79 @@
2222
<modelVersion>4.0.0</modelVersion>
2323

2424
<groupId>org.deeplearning4j</groupId>
25-
<artifactId>data-pipeline-examples</artifactId>
25+
<artifactId>dl4j-distributed-training-examples</artifactId>
2626
<version>1.0.0-beta7</version>
27-
<name>Building a data pipeline prior to modeling</name>
28-
<description>Loading raw data and processing it before training</description>
27+
<name>Introduction to Distributed Training with DL4J</name>
28+
<description>A set of examples introducing distributed training with the DL4J framework</description>
2929

3030
<properties>
31-
<dl4j-master.version>1.0.0-SNAPSHOT</dl4j-master.version>
31+
<dl4j-master.version>1.0.0-beta7</dl4j-master.version>
3232
<!-- Change the nd4j.backend property to nd4j-cuda-X-platform to use CUDA GPUs -->
33-
<!-- <nd4j.backend>nd4j-cuda-10.2-platform</nd4j.backend> -->
33+
<!-- <nd4j.backend>nd4j-cuda-10.2-platform</nd4j.backend> -->
3434
<nd4j.backend>nd4j-native</nd4j.backend>
3535
<java.version>1.8</java.version>
36+
<shadedClassifier>bin</shadedClassifier>
37+
<scala.binary.version>2.11</scala.binary.version>
3638
<maven-compiler-plugin.version>3.6.1</maven-compiler-plugin.version>
3739
<maven.minimum.version>3.3.1</maven.minimum.version>
3840
<exec-maven-plugin.version>1.4.0</exec-maven-plugin.version>
3941
<maven-shade-plugin.version>2.4.3</maven-shade-plugin.version>
42+
<jcommon.version>1.0.23</jcommon.version>
43+
<jfreechart.version>1.0.13</jfreechart.version>
4044
<logback.version>1.1.7</logback.version>
41-
<scala.binary.version>2.11</scala.binary.version>
42-
<spark.version>2.4.3</spark.version>
45+
<jcommander.version>1.27</jcommander.version>
46+
<azure.hadoop.version>2.7.4</azure.hadoop.version>
47+
<azure.storage.version>2.0.0</azure.storage.version>
48+
<spark.version>2.1.0</spark.version>
49+
<aws.sdk.version>1.11.109</aws.sdk.version>
50+
<jackson.version>2.5.1</jackson.version>
51+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4352
</properties>
4453

45-
<dependencyManagement>
54+
<dependencyManagement>
4655
<dependencies>
56+
<dependency>
57+
<!-- Force Jackson versions to match Spark. This usually only matters for Spark local, not Spark submit -->
58+
<groupId>com.fasterxml.jackson.core</groupId>
59+
<artifactId>jackson-core</artifactId>
60+
<version>${jackson.version}</version>
61+
</dependency>
62+
<dependency>
63+
<groupId>com.fasterxml.jackson.core</groupId>
64+
<artifactId>jackson-databind</artifactId>
65+
<version>${jackson.version}</version>
66+
</dependency>
67+
<dependency>
68+
<groupId>com.fasterxml.jackson.core</groupId>
69+
<artifactId>jackson-annotations</artifactId>
70+
<version>${jackson.version}</version>
71+
</dependency>
72+
<dependency>
73+
<groupId>com.fasterxml.jackson.module</groupId>
74+
<artifactId>jackson-module-scala_${scala.binary.version}</artifactId>
75+
<version>${jackson.version}</version>
76+
</dependency>
77+
<dependency>
78+
<groupId>com.fasterxml.jackson.datatype</groupId>
79+
<artifactId>jackson-datatype-jdk8</artifactId>
80+
<version>${jackson.version}</version>
81+
</dependency>
82+
<dependency>
83+
<groupId>com.fasterxml.jackson.datatype</groupId>
84+
<artifactId>jackson-datatype-jsr310</artifactId>
85+
<version>${jackson.version}</version>
86+
</dependency>
87+
88+
<dependency>
89+
<groupId>org.datavec</groupId>
90+
<artifactId>datavec-spark_${scala.binary.version}</artifactId>
91+
<version>1.0.0-beta7_spark_2</version>
92+
</dependency>
93+
<dependency>
94+
<groupId>org.deeplearning4j</groupId>
95+
<artifactId>deeplearning4j-ui</artifactId>
96+
<version>${dl4j-master.version}</version>
97+
</dependency>
4798
<dependency>
4899
<groupId>org.freemarker</groupId>
49100
<artifactId>freemarker</artifactId>
@@ -58,140 +109,85 @@
58109
</dependencyManagement>
59110

60111
<dependencies>
112+
<dependency>
113+
<groupId>org.apache.spark</groupId>
114+
<artifactId>spark-core_${scala.binary.version}</artifactId>
115+
<version>${spark.version}</version>
116+
</dependency>
61117
<dependency>
62118
<groupId>org.nd4j</groupId>
63119
<artifactId>${nd4j.backend}</artifactId>
64120
<version>${dl4j-master.version}</version>
65121
</dependency>
66122
<dependency>
67123
<groupId>org.datavec</groupId>
68-
<artifactId>datavec-api</artifactId>
124+
<artifactId>datavec-spark_${scala.binary.version}</artifactId>
69125
<version>${dl4j-master.version}</version>
70126
</dependency>
71127
<dependency>
72-
<groupId>org.datavec</groupId>
73-
<artifactId>datavec-data-image</artifactId>
128+
<groupId>org.deeplearning4j</groupId>
129+
<artifactId>dl4j-spark_${scala.binary.version}</artifactId>
74130
<version>${dl4j-master.version}</version>
75131
</dependency>
76132
<dependency>
77-
<groupId>org.datavec</groupId>
78-
<artifactId>datavec-spark_${scala.binary.version}</artifactId>
79-
<version>1.0.0-SNAPSHOT</version>
133+
<groupId>org.deeplearning4j</groupId>
134+
<artifactId>dl4j-spark-parameterserver_${scala.binary.version}</artifactId>
135+
<version>${dl4j-master.version}</version>
80136
</dependency>
81137
<dependency>
82-
<groupId>org.datavec</groupId>
83-
<artifactId>datavec-local</artifactId>
84-
<version>${dl4j-master.version}</version>
138+
<groupId>com.beust</groupId>
139+
<artifactId>jcommander</artifactId>
140+
<version>${jcommander.version}</version>
85141
</dependency>
142+
<!-- Used for patent classification example -->
86143
<dependency>
87144
<groupId>org.deeplearning4j</groupId>
88-
<artifactId>deeplearning4j-datasets</artifactId>
145+
<artifactId>deeplearning4j-nlp</artifactId>
89146
<version>${dl4j-master.version}</version>
90147
</dependency>
91148
<dependency>
92-
<groupId>org.deeplearning4j</groupId>
93-
<artifactId>deeplearning4j-core</artifactId>
149+
<groupId>org.datavec</groupId>
150+
<artifactId>datavec-local</artifactId>
94151
<version>${dl4j-master.version}</version>
95152
</dependency>
96153
<dependency>
97154
<groupId>org.deeplearning4j</groupId>
98-
<artifactId>deeplearning4j-ui</artifactId>
155+
<artifactId>deeplearning4j-zoo</artifactId>
99156
<version>${dl4j-master.version}</version>
100-
<exclusions>
101-
<exclusion>
102-
<groupId>net.jpountz.lz4</groupId>
103-
<artifactId>lz4</artifactId>
104-
</exclusion>
105-
</exclusions>
106157
</dependency>
158+
<!-- Used for patent classification example -->
107159
<dependency>
108-
<groupId>org.apache.spark</groupId>
109-
<artifactId>spark-core_${scala.binary.version}</artifactId>
110-
<version>${spark.version}</version>
111-
<exclusions>
112-
<exclusion>
113-
<groupId>org.apache.hadoop</groupId>
114-
<artifactId>log4j</artifactId>
115-
</exclusion>
116-
<exclusion>
117-
<groupId>org.slf4j</groupId>
118-
<artifactId>slf4j-log4j12</artifactId>
119-
</exclusion>
120-
</exclusions>
160+
<groupId>org.apache.hadoop</groupId>
161+
<artifactId>hadoop-azure</artifactId>
162+
<version>${azure.hadoop.version}</version>
121163
</dependency>
164+
<!-- Used for patent classification example -->
122165
<dependency>
123-
<groupId>io.netty</groupId>
124-
<artifactId>netty-all</artifactId>
125-
<version>4.1.22.Final</version>
166+
<groupId>com.microsoft.azure</groupId>
167+
<artifactId>azure-storage</artifactId>
168+
<version>${azure.storage.version}</version>
126169
</dependency>
127170
<dependency>
128-
<groupId>ch.qos.logback</groupId>
129-
<artifactId>logback-classic</artifactId>
130-
<version>${logback.version}</version>
171+
<groupId>com.amazonaws</groupId>
172+
<artifactId>aws-java-sdk-emr</artifactId>
173+
<version>${aws.sdk.version}</version>
174+
<scope>provided</scope>
131175
</dependency>
132176
<dependency>
133-
<groupId>org.apache.httpcomponents</groupId>
134-
<artifactId>httpclient</artifactId>
135-
<version>4.3.5</version>
177+
<groupId>com.amazonaws</groupId>
178+
<artifactId>aws-java-sdk-s3</artifactId>
179+
<version>${aws.sdk.version}</version>
180+
<scope>provided</scope>
181+
</dependency>
182+
<dependency>
183+
<groupId>org.jsoup</groupId>
184+
<artifactId>jsoup</artifactId>
185+
<version>1.10.2</version>
136186
</dependency>
137187
</dependencies>
138188

139-
<!-- Maven Enforcer: Ensures user has an up to date version of Maven before building -->
140189
<build>
141190
<plugins>
142-
<plugin>
143-
<artifactId>maven-enforcer-plugin</artifactId>
144-
<version>1.0.1</version>
145-
<executions>
146-
<execution>
147-
<id>enforce-default</id>
148-
<goals>
149-
<goal>enforce</goal>
150-
</goals>
151-
<configuration>
152-
<rules>
153-
<requireMavenVersion>
154-
<version>[${maven.minimum.version},)</version>
155-
<message>********** Minimum Maven Version is ${maven.minimum.version}. Please upgrade Maven before continuing (run "mvn --version" to check). **********</message>
156-
</requireMavenVersion>
157-
</rules>
158-
</configuration>
159-
</execution>
160-
</executions>
161-
</plugin>
162-
<plugin>
163-
<groupId>org.apache.maven.plugins</groupId>
164-
<artifactId>maven-compiler-plugin</artifactId>
165-
<version>${maven-compiler-plugin.version}</version>
166-
<configuration>
167-
<source>${java.version}</source>
168-
<target>${java.version}</target>
169-
</configuration>
170-
</plugin>
171-
<plugin>
172-
<groupId>com.lewisd</groupId>
173-
<artifactId>lint-maven-plugin</artifactId>
174-
<version>0.0.11</version>
175-
<configuration>
176-
<failOnViolation>true</failOnViolation>
177-
<onlyRunRules>
178-
<rule>DuplicateDep</rule>
179-
<rule>RedundantPluginVersion</rule>
180-
<!-- Rules incompatible with Java 9
181-
<rule>VersionProp</rule>
182-
<rule>DotVersionProperty</rule> -->
183-
</onlyRunRules>
184-
</configuration>
185-
<executions>
186-
<execution>
187-
<id>pom-lint</id>
188-
<phase>validate</phase>
189-
<goals>
190-
<goal>check</goal>
191-
</goals>
192-
</execution>
193-
</executions>
194-
</plugin>
195191
<plugin>
196192
<groupId>org.codehaus.mojo</groupId>
197193
<artifactId>exec-maven-plugin</artifactId>
@@ -246,34 +242,16 @@
246242
</execution>
247243
</executions>
248244
</plugin>
245+
246+
<plugin>
247+
<groupId>org.apache.maven.plugins</groupId>
248+
<artifactId>maven-compiler-plugin</artifactId>
249+
<version>3.5.1</version>
250+
<configuration>
251+
<source>${java.version}</source>
252+
<target>${java.version}</target>
253+
</configuration>
254+
</plugin>
249255
</plugins>
250-
<pluginManagement>
251-
<plugins>
252-
<plugin>
253-
<groupId>org.eclipse.m2e</groupId>
254-
<artifactId>lifecycle-mapping</artifactId>
255-
<version>1.0.0</version>
256-
<configuration>
257-
<lifecycleMappingMetadata>
258-
<pluginExecutions>
259-
<pluginExecution>
260-
<pluginExecutionFilter>
261-
<groupId>com.lewisd</groupId>
262-
<artifactId>lint-maven-plugin</artifactId>
263-
<versionRange>[0.0.11,)</versionRange>
264-
<goals>
265-
<goal>check</goal>
266-
</goals>
267-
</pluginExecutionFilter>
268-
<action>
269-
<ignore/>
270-
</action>
271-
</pluginExecution>
272-
</pluginExecutions>
273-
</lifecycleMappingMetadata>
274-
</configuration>
275-
</plugin>
276-
</plugins>
277-
</pluginManagement>
278256
</build>
279257
</project>

0 commit comments

Comments
 (0)