Skip to content

Commit cecaf58

Browse files
agibsoncccagibsonccc
authored
Merge pull request #1065 from eclipse/ag_test_1040
Update for release 1.0.0-M2.1
2 parents 3e6cf7f + 2602618 commit cecaf58

File tree

18 files changed

+650
-137
lines changed

18 files changed

+650
-137
lines changed

‎data-pipeline-examples/pom.xml

+4-22
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ information regarding copyright ownership.
3232
<description>Loading raw data and processing it before training</description>
3333

3434
<properties>
35-
<dl4j-master.version>1.0.0-M2</dl4j-master.version>
35+
<dl4j-master.version>1.0.0-M2.1</dl4j-master.version>
3636
<!-- Change the nd4j.backend property to nd4j-cuda-X-platform to use CUDA GPUs -->
3737
<!-- <nd4j.backend>nd4j-cuda-10.2-platform</nd4j.backend> -->
3838
<nd4j.backend>nd4j-native</nd4j.backend>
@@ -62,27 +62,9 @@ information regarding copyright ownership.
6262
<updatePolicy>daily</updatePolicy> <!-- Optional, update daily -->
6363
</snapshots>
6464
</repository>
65-
<repository>
66-
<id>M2</id>
67-
<url>https://s01.oss.sonatype.org/content/repositories/orgdeeplearning4j-1019</url>
68-
<releases>
69-
<enabled>true</enabled>
70-
</releases>
71-
</repository>
72-
<repository>
73-
<id>M2-1</id>
74-
<url>https://s01.oss.sonatype.org/content/repositories/orgdeeplearning4j-1032</url>
75-
<releases>
76-
<enabled>true</enabled>
77-
</releases>
78-
</repository>
79-
<repository>
80-
<id>M2-2</id>
81-
<url>https://s01.oss.sonatype.org/content/repositories/orgdeeplearning4j-1034</url>
82-
<releases>
83-
<enabled>true</enabled>
84-
</releases>
85-
</repository>
65+
66+
67+
8668
</repositories>
8769

8870

‎dl4j-distributed-training-examples/pom.xml

+2-22
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ information regarding copyright ownership.
3232
<description>A set of examples introducing distributed training with the DL4J framework</description>
3333

3434
<properties>
35-
<dl4j-master.version>1.0.0-M2</dl4j-master.version>
35+
<dl4j-master.version>1.0.0-M2.1</dl4j-master.version>
3636
<!-- Change the nd4j.backend property to nd4j-cuda-X-platform to use CUDA GPUs -->
3737
<!-- <nd4j.backend>nd4j-cuda-10.2-platform</nd4j.backend> -->
3838
<nd4j.backend>nd4j-native</nd4j.backend>
@@ -68,27 +68,7 @@ information regarding copyright ownership.
6868
<updatePolicy>daily</updatePolicy> <!-- Optional, update daily -->
6969
</snapshots>
7070
</repository>
71-
<repository>
72-
<id>M2</id>
73-
<url>https://s01.oss.sonatype.org/content/repositories/orgdeeplearning4j-1019</url>
74-
<releases>
75-
<enabled>true</enabled>
76-
</releases>
77-
</repository>
78-
<repository>
79-
<id>M2-1</id>
80-
<url>https://s01.oss.sonatype.org/content/repositories/orgdeeplearning4j-1032</url>
81-
<releases>
82-
<enabled>true</enabled>
83-
</releases>
84-
</repository>
85-
<repository>
86-
<id>M2-2</id>
87-
<url>https://s01.oss.sonatype.org/content/repositories/orgdeeplearning4j-1034</url>
88-
<releases>
89-
<enabled>true</enabled>
90-
</releases>
91-
</repository>
71+
9272
</repositories>
9373

9474

‎dl4j-examples/pom.xml

+4-22
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ information regarding copyright ownership.
3232
<description>A set of examples introducing the DL4J framework</description>
3333

3434
<properties>
35-
<dl4j-master.version>1.0.0-M2</dl4j-master.version>
35+
<dl4j-master.version>1.0.0-M2.1</dl4j-master.version>
3636
<!-- Change the nd4j.backend property to nd4j-cuda-X-platform to use CUDA GPUs -->
3737
<!-- <nd4j.backend>nd4j-cuda-10.2-platform</nd4j.backend> -->
3838
<nd4j.backend>nd4j-native</nd4j.backend>
@@ -64,27 +64,9 @@ information regarding copyright ownership.
6464
<updatePolicy>daily</updatePolicy> <!-- Optional, update daily -->
6565
</snapshots>
6666
</repository>
67-
<repository>
68-
<id>M2</id>
69-
<url>https://s01.oss.sonatype.org/content/repositories/orgdeeplearning4j-1019</url>
70-
<releases>
71-
<enabled>true</enabled>
72-
</releases>
73-
</repository>
74-
<repository>
75-
<id>M2-1</id>
76-
<url>https://s01.oss.sonatype.org/content/repositories/orgdeeplearning4j-1032</url>
77-
<releases>
78-
<enabled>true</enabled>
79-
</releases>
80-
</repository>
81-
<repository>
82-
<id>M2-2</id>
83-
<url>https://s01.oss.sonatype.org/content/repositories/orgdeeplearning4j-1034</url>
84-
<releases>
85-
<enabled>true</enabled>
86-
</releases>
87-
</repository>
67+
68+
69+
8870
</repositories>
8971

9072
<dependencies>

‎dl4j-examples/src/main/java/org/deeplearning4j/examples/advanced/modelling/charmodelling/generatetext/GenerateTxtModel.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ static CharacterIterator getShakespeareIterator(int miniBatchSize, int sequenceL
137137
//The Complete Works of William Shakespeare
138138
//5.3MB file in UTF-8 Encoding, ~5.4 million characters
139139
//https://www.gutenberg.org/ebooks/100
140-
String url = "https://s3.amazonaws.com/dl4j-distribution/pg100.txt";
140+
String url = "https://raw.githubusercontent.com/KonduitAI/dl4j-test-resources/master/src/main/resources/word2vec/shakespeare.txt";
141141
String tempDir = System.getProperty("java.io.tmpdir");
142142
String fileLocation = tempDir + "/Shakespeare.txt"; //Storage location from downloaded file
143143
File f = new File(fileLocation);

‎dl4j-examples/src/main/java/org/deeplearning4j/examples/advanced/modelling/objectdetection/TinyYoloHouseNumberDetection.java

+5-4
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,12 @@
4949
import org.deeplearning4j.util.ModelSerializer;
5050
import org.deeplearning4j.zoo.model.TinyYOLO;
5151
import org.nd4j.linalg.activations.Activation;
52+
import org.nd4j.linalg.api.memory.enums.DebugMode;
5253
import org.nd4j.linalg.api.ndarray.INDArray;
5354
import org.nd4j.linalg.dataset.api.preprocessor.ImagePreProcessingScaler;
5455
import org.nd4j.linalg.factory.Nd4j;
5556
import org.nd4j.linalg.learning.config.Adam;
57+
import org.nd4j.linalg.profiler.ProfilerConfig;
5658
import org.slf4j.Logger;
5759
import org.slf4j.LoggerFactory;
5860

@@ -122,18 +124,17 @@ public static void main(String[] args) throws java.lang.Exception {
122124
File trainDir = fetcher.getDataSetPath(DataSetType.TRAIN);
123125
File testDir = fetcher.getDataSetPath(DataSetType.TEST);
124126

125-
126127
log.info("Load data...");
127128

128129
FileSplit trainData = new FileSplit(trainDir, NativeImageLoader.ALLOWED_FORMATS, rng);
129130
FileSplit testData = new FileSplit(testDir, NativeImageLoader.ALLOWED_FORMATS, rng);
130131

131132
ObjectDetectionRecordReader recordReaderTrain = new ObjectDetectionRecordReader(height, width, nChannels,
132-
gridHeight, gridWidth, new SvhnLabelProvider(trainDir));
133+
gridHeight, gridWidth, new SvhnLabelProvider(trainDir));
133134
recordReaderTrain.initialize(trainData);
134135

135136
ObjectDetectionRecordReader recordReaderTest = new ObjectDetectionRecordReader(height, width, nChannels,
136-
gridHeight, gridWidth, new SvhnLabelProvider(testDir));
137+
gridHeight, gridWidth, new SvhnLabelProvider(testDir));
137138
recordReaderTest.initialize(testData);
138139

139140
// ObjectDetectionRecordReader performs regression, so we need to specify it here
@@ -210,7 +211,7 @@ public static void main(String[] args) throws java.lang.Exception {
210211
CanvasFrame frame = new CanvasFrame("HouseNumberDetection");
211212
OpenCVFrameConverter.ToMat converter = new OpenCVFrameConverter.ToMat();
212213
org.deeplearning4j.nn.layers.objdetect.Yolo2OutputLayer yout =
213-
(org.deeplearning4j.nn.layers.objdetect.Yolo2OutputLayer)model.getOutputLayer(0);
214+
(org.deeplearning4j.nn.layers.objdetect.Yolo2OutputLayer)model.getOutputLayer(0);
214215
List<String> labels = train.getLabels();
215216
test.setCollectMetaData(true);
216217
Scalar[] colormap = {RED,BLUE,GREEN,CYAN,YELLOW,MAGENTA,ORANGE,PINK,LIGHTBLUE,VIOLET};

‎mvn-project-template/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ information regarding copyright ownership.
3232

3333
<!-- Properties Section. Change ND4J versions here, if required -->
3434
<properties>
35-
<dl4j-master.version>1.0.0-M2</dl4j-master.version>
35+
<dl4j-master.version>1.0.0-M2.1</dl4j-master.version>
3636
<logback.version>1.2.3</logback.version>
3737
<java.version>1.8</java.version>
3838
<maven-shade-plugin.version>2.4.3</maven-shade-plugin.version>

‎nd4j-ndarray-examples/pom.xml

+4-15
Original file line numberDiff line numberDiff line change
@@ -44,25 +44,14 @@ information regarding copyright ownership.
4444
<updatePolicy>daily</updatePolicy> <!-- Optional, update daily -->
4545
</snapshots>
4646
</repository>
47-
<repository>
48-
<id>M2</id>
49-
<url>https://s01.oss.sonatype.org/content/repositories/orgdeeplearning4j-1019</url>
50-
<releases>
51-
<enabled>true</enabled>
52-
</releases>
53-
</repository>
54-
<repository>
55-
<id>M2-1</id>
56-
<url>https://s01.oss.sonatype.org/content/repositories/orgdeeplearning4j-1030</url>
57-
<releases>
58-
<enabled>true</enabled>
59-
</releases>
60-
</repository>
47+
48+
49+
6150
</repositories>
6251

6352

6453
<properties>
65-
<dl4j-master.version>1.0.0-M2</dl4j-master.version>
54+
<dl4j-master.version>1.0.0-M2.1</dl4j-master.version>
6655
<!-- Change the nd4j.backend property to nd4j-cuda-X-platform to use CUDA GPUs -->
6756
<!-- <nd4j.backend>nd4j-cuda-10.2-platform</nd4j.backend> -->
6857
<nd4j.backend>nd4j-native</nd4j.backend>

‎onnx-import-examples/pom.xml

+4-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ information regarding copyright ownership.
3232
<description>Loading models trained in keras or tensorflow</description>
3333

3434
<properties>
35-
<dl4j-master.version>1.0.0-M2</dl4j-master.version>
35+
<dl4j-master.version>1.0.0-SNAPSHOT</dl4j-master.version>
3636
<!-- Change the nd4j.backend property to nd4j-cuda-X-platform to use CUDA GPUs -->
3737
<nd4j.backend>nd4j-native</nd4j.backend>
3838
<!-- <nd4j.backend>nd4j-cuda-10.2-platform</nd4j.backend> -->
@@ -61,6 +61,9 @@ information regarding copyright ownership.
6161
<updatePolicy>daily</updatePolicy> <!-- Optional, update daily -->
6262
</snapshots>
6363
</repository>
64+
65+
66+
6467
</repositories>
6568

6669

‎samediff-examples/pom.xml

+4-26
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ information regarding copyright ownership.
3232
<description>A set of beginner examples introducing the SameDiff framework</description>
3333

3434
<properties>
35-
<dl4j-master.version>1.0.0-M2</dl4j-master.version>
35+
<dl4j-master.version>1.0.0-M2.1</dl4j-master.version>
3636
<!-- Change the nd4j.backend property to nd4j-cuda-X-platform to use CUDA GPUs -->
3737
<!-- <nd4j.backend>nd4j-cuda-10.2-platform</nd4j.backend> -->
3838
<nd4j.backend>nd4j-native</nd4j.backend>
@@ -50,10 +50,6 @@ information regarding copyright ownership.
5050
</properties>
5151

5252
<repositories>
53-
<repository>
54-
<id>orgdeeplearning4j-1177</id>
55-
<url>https://oss.sonatype.org/content/repositories/orgdeeplearning4j-1177</url>
56-
</repository>
5753

5854
<repository>
5955
<id>sonatype-nexus-snapshots</id>
@@ -67,27 +63,9 @@ information regarding copyright ownership.
6763
<updatePolicy>daily</updatePolicy> <!-- Optional, update daily -->
6864
</snapshots>
6965
</repository>
70-
<repository>
71-
<id>M2</id>
72-
<url>https://s01.oss.sonatype.org/content/repositories/orgdeeplearning4j-1019</url>
73-
<releases>
74-
<enabled>true</enabled>
75-
</releases>
76-
</repository>
77-
<repository>
78-
<id>M2-1</id>
79-
<url>https://s01.oss.sonatype.org/content/repositories/orgdeeplearning4j-1032</url>
80-
<releases>
81-
<enabled>true</enabled>
82-
</releases>
83-
</repository>
84-
<repository>
85-
<id>M2-2</id>
86-
<url>https://s01.oss.sonatype.org/content/repositories/orgdeeplearning4j-1034</url>
87-
<releases>
88-
<enabled>true</enabled>
89-
</releases>
90-
</repository>
66+
67+
68+
9169
</repositories>
9270

9371

‎tensorflow-keras-import-examples/pom.xml

+4-22
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ information regarding copyright ownership.
3232
<description>Loading models trained in keras or tensorflow</description>
3333

3434
<properties>
35-
<dl4j-master.version>1.0.0-M2</dl4j-master.version>
35+
<dl4j-master.version>1.0.0-M2.1</dl4j-master.version>
3636
<!-- Change the nd4j.backend property to nd4j-cuda-X-platform to use CUDA GPUs -->
3737
<nd4j.backend>nd4j-native</nd4j.backend>
3838
<!-- <nd4j.backend>nd4j-cuda-10.2-platform</nd4j.backend> -->
@@ -61,27 +61,9 @@ information regarding copyright ownership.
6161
<updatePolicy>daily</updatePolicy> <!-- Optional, update daily -->
6262
</snapshots>
6363
</repository>
64-
<repository>
65-
<id>M2</id>
66-
<url>https://s01.oss.sonatype.org/content/repositories/orgdeeplearning4j-1019</url>
67-
<releases>
68-
<enabled>true</enabled>
69-
</releases>
70-
</repository>
71-
<repository>
72-
<id>M2-1</id>
73-
<url>https://s01.oss.sonatype.org/content/repositories/orgdeeplearning4j-1032</url>
74-
<releases>
75-
<enabled>true</enabled>
76-
</releases>
77-
</repository>
78-
<repository>
79-
<id>M2-2</id>
80-
<url>https://s01.oss.sonatype.org/content/repositories/orgdeeplearning4j-1034</url>
81-
<releases>
82-
<enabled>true</enabled>
83-
</releases>
84-
</repository>
64+
65+
66+
8567
</repositories>
8668

8769

‎tensorflow-keras-import-examples/src/main/java/org/deeplearning4j/modelimportexamples/tf/advanced/mobilenet/ImportMobileNetExample.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import org.apache.commons.io.FilenameUtils;
44
import org.datavec.image.loader.ImageLoader;
5-
import org.deeplearning4j.zoo.util.imagenet.ImageNetLabels;
5+
import org.deeplearning4j.modelimportexamples.util.imagenet.ImageNetLabels;
66
import org.nd4j.autodiff.samediff.SameDiff;
77
import org.nd4j.common.resources.Downloader;
88
import org.nd4j.linalg.api.ndarray.INDArray;

0 commit comments

Comments
 (0)