Brutex
/
cavis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'eclipse/master'

master
Alex Black 2020-03-30 22:18:25 +11:00
parent 3900d9ff06 364f9a660c
commit 9b3576bc00
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/config/KerasLayerConfiguration.java
View File

@ -334,6 +334,7 @@ public class KerasLayerConfiguration {
private final String KERAS_ACTIVATION_SIGMOID = "sigmoid"; private final String KERAS_ACTIVATION_SIGMOID = "sigmoid";
private final String KERAS_ACTIVATION_HARD_SIGMOID = "hard_sigmoid"; private final String KERAS_ACTIVATION_HARD_SIGMOID = "hard_sigmoid";
private final String KERAS_ACTIVATION_LINEAR = "linear"; private final String KERAS_ACTIVATION_LINEAR = "linear";
private final String KERAS_ACTIVATION_SWISH = "swish";
private final String KERAS_ACTIVATION_ELU = "elu"; // keras 2 only private final String KERAS_ACTIVATION_ELU = "elu"; // keras 2 only
private final String KERAS_ACTIVATION_SELU = "selu"; // keras 2 only private final String KERAS_ACTIVATION_SELU = "selu"; // keras 2 only

2
deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/utils/KerasActivationUtils.java
View File

@ -63,6 +63,8 @@ public class KerasActivationUtils {
dl4jActivation = Activation.HARDSIGMOID; dl4jActivation = Activation.HARDSIGMOID;
} else if (kerasActivation.equals(conf.getKERAS_ACTIVATION_LINEAR())) { } else if (kerasActivation.equals(conf.getKERAS_ACTIVATION_LINEAR())) {
dl4jActivation = Activation.IDENTITY; dl4jActivation = Activation.IDENTITY;
} else if (kerasActivation.equals(conf.getKERAS_ACTIVATION_SWISH())) {
dl4jActivation = Activation.SWISH;
} else { } else {
throw new UnsupportedKerasConfigurationException( throw new UnsupportedKerasConfigurationException(
"Unknown Keras activation function " + kerasActivation); "Unknown Keras activation function " + kerasActivation);

4
nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/pom.xml
View File

@ -230,8 +230,8 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<configuration> <configuration>
<source>8</source> <source>7</source>
<target>8</target> <target>7</target>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>