Skip to content

Commit

Permalink
Import and test dependency cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@karllessard
karllessard committed Jul 14, 2020
1 parent 25abbbf commit de6058d
Show file tree
Hide file tree
Showing 6 changed files with 153 additions and 153 deletions.
2 changes: 1 addition & 1 deletion ndarray/src/test/java/org/tensorflow/ndarray/BooleanNdArrayTestBase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.tensorflow.ndarray.NdArrays.vectorOf;

import org.junit.Test;
import org.junit.jupiter.api.Test;

public abstract class BooleanNdArrayTestBase extends NdArrayTestBase<Boolean> {

Expand Down
2 changes: 1 addition & 1 deletion ndarray/src/test/java/org/tensorflow/ndarray/NdArrayTestBase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

import java.nio.BufferOverflowException;
import java.nio.BufferUnderflowException;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.tensorflow.ndarray.buffer.DataBuffer;

public abstract class NdArrayTestBase<T> {
Expand Down
1 change: 0 additions & 1 deletion ndarray/src/test/java/org/tensorflow/ndarray/ShortNdArrayTestBase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import static org.junit.jupiter.api.Assertions.assertEquals;

import org.junit.jupiter.api.Test;
import org.junit.Test;

public abstract class ShortNdArrayTestBase extends NdArrayTestBase<Short> {

Expand Down
149 changes: 149 additions & 0 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,155 @@
</repository>
</distributionManagement>
</profile>

<!-- Normalize OS properties for building a valid native classifier -->
<profile>
<id>linuxos</id>
<activation>
<os><name>linux</name></os>
</activation>
<properties>
<os.kernel>linux</os.kernel>
<os.name>linux</os.name>
</properties>
</profile>
<profile>
<id>macosx</id>
<activation>
<os><name>mac os x</name></os>
</activation>
<properties>
<os.kernel>darwin</os.kernel>
<os.name>macosx</os.name>
</properties>
</profile>
<profile>
<id>windowsos</id>
<activation>
<os><family>windows</family></os>
</activation>
<properties>
<os.kernel>windows</os.kernel>
<os.name>windows</os.name>
</properties>
</profile>
<profile>
<id>arm</id>
<activation>
<os><arch>arm</arch></os>
</activation>
<properties>
<os.arch>armhf</os.arch>
</properties>
</profile>
<profile>
<id>aarch64</id>
<activation>
<os><arch>aarch64</arch></os>
</activation>
<properties>
<os.arch>arm64</os.arch>
</properties>
</profile>
<profile>
<id>armv8</id>
<activation>
<os><arch>armv8</arch></os>
</activation>
<properties>
<os.arch>arm64</os.arch>
</properties>
</profile>
<profile>
<id>i386</id>
<activation>
<os><arch>i386</arch></os>
</activation>
<properties>
<os.arch>x86</os.arch>
</properties>
</profile>
<profile>
<id>i486</id>
<activation>
<os><arch>i486</arch></os>
</activation>
<properties>
<os.arch>x86</os.arch>
</properties>
</profile>
<profile>
<id>i586</id>
<activation>
<os><arch>i586</arch></os>
</activation>
<properties>
<os.arch>x86</os.arch>
</properties>
</profile>
<profile>
<id>i686</id>
<activation>
<os><arch>i686</arch></os>
</activation>
<properties>
<os.arch>x86</os.arch>
</properties>
</profile>
<profile>
<id>amd64</id>
<activation>
<os><arch>amd64</arch></os>
</activation>
<properties>
<os.arch>x86_64</os.arch>
</properties>
</profile>
<profile>
<id>x86-64</id>
<activation>
<os><arch>x86-64</arch></os>
</activation>
<properties>
<os.arch>x86_64</os.arch>
</properties>
</profile>

<profile>
<id>linux</id>
<activation>
<os>
<family>unix</family>
<name>Linux</name>
</os>
</activation>
<properties>
<os.adjusted.name>linux</os.adjusted.name>
</properties>
</profile>
<profile>
<id>darwin</id>
<activation>
<os>
<family>unix</family>
<name>Mac OS X</name>
</os>
</activation>
<properties>
<os.adjusted.name>darwin</os.adjusted.name>
</properties>
</profile>
<profile>
<id>windows</id>
<activation>
<os>
<family>windows</family>
</os>
</activation>
<properties>
<os.adjusted.name>windows</os.adjusted.name>
</properties>
</profile>
</profiles>

<!-- http://central.sonatype.org/pages/requirements.html#developer-information -->
Expand Down
149 changes: 0 additions & 149 deletions tensorflow-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -822,155 +822,6 @@
<javacpp.platform.windows-x86_64.extension>windows-x86_64${javacpp.platform.extension}</javacpp.platform.windows-x86_64.extension>
</properties>
</profile>

<!-- Profiles to set the default javacpp.platform property: If someone knows a better way to do this, please do let me know! -->
<profile>
<id>linuxos</id>
<activation>
<os><name>linux</name></os>
</activation>
<properties>
<os.kernel>linux</os.kernel>
<os.name>linux</os.name>
</properties>
</profile>
<profile>
<id>macosx</id>
<activation>
<os><name>mac os x</name></os>
</activation>
<properties>
<os.kernel>darwin</os.kernel>
<os.name>macosx</os.name>
</properties>
</profile>
<profile>
<id>windowsos</id>
<activation>
<os><family>windows</family></os>
</activation>
<properties>
<os.kernel>windows</os.kernel>
<os.name>windows</os.name>
</properties>
</profile>
<profile>
<id>arm</id>
<activation>
<os><arch>arm</arch></os>
</activation>
<properties>
<os.arch>armhf</os.arch>
</properties>
</profile>
<profile>
<id>aarch64</id>
<activation>
<os><arch>aarch64</arch></os>
</activation>
<properties>
<os.arch>arm64</os.arch>
</properties>
</profile>
<profile>
<id>armv8</id>
<activation>
<os><arch>armv8</arch></os>
</activation>
<properties>
<os.arch>arm64</os.arch>
</properties>
</profile>
<profile>
<id>i386</id>
<activation>
<os><arch>i386</arch></os>
</activation>
<properties>
<os.arch>x86</os.arch>
</properties>
</profile>
<profile>
<id>i486</id>
<activation>
<os><arch>i486</arch></os>
</activation>
<properties>
<os.arch>x86</os.arch>
</properties>
</profile>
<profile>
<id>i586</id>
<activation>
<os><arch>i586</arch></os>
</activation>
<properties>
<os.arch>x86</os.arch>
</properties>
</profile>
<profile>
<id>i686</id>
<activation>
<os><arch>i686</arch></os>
</activation>
<properties>
<os.arch>x86</os.arch>
</properties>
</profile>
<profile>
<id>amd64</id>
<activation>
<os><arch>amd64</arch></os>
</activation>
<properties>
<os.arch>x86_64</os.arch>
</properties>
</profile>
<profile>
<id>x86-64</id>
<activation>
<os><arch>x86-64</arch></os>
</activation>
<properties>
<os.arch>x86_64</os.arch>
</properties>
</profile>

<profile>
<id>linux</id>
<activation>
<os>
<family>unix</family>
<name>Linux</name>
</os>
</activation>
<properties>
<os.adjusted.name>linux</os.adjusted.name>
</properties>
</profile>
<profile>
<id>darwin</id>
<activation>
<os>
<family>unix</family>
<name>Mac OS X</name>
</os>
</activation>
<properties>
<os.adjusted.name>darwin</os.adjusted.name>
</properties>
</profile>
<profile>
<id>windows</id>
<activation>
<os>
<family>windows</family>
</os>
</activation>
<properties>
<os.adjusted.name>windows</os.adjusted.name>
</properties>
</profile>
</profiles>

</project>
Expand Down
3 changes: 2 additions & 1 deletion tensorflow-framework/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,10 @@
<!-- Include native binaries dependencies only for testing -->
<dependency>
<groupId>org.tensorflow</groupId>
<artifactId>tensorflow-core-platform${javacpp.platform.extension}</artifactId>
<artifactId>tensorflow-core-api</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<classifier>${os.name}-${os.arch}${javacpp.platform.extension}</classifier> <!-- TODO: share this property with core module -->
</dependency>
</dependencies>

Expand Down

0 comments on commit de6058d

Please sign in to comment.