* merge conf * merge conf * tfkeras tests * parameterized tests * rename * cuda versions * jccp versions * 'updates' * updates * rnn+mlp passing * repeat * updates * tests * Update pom.xml * Update pom.xml * rem print * cnn1d model conversion fixed * cnn1d activate fixed * cnn1d outptut shape fix * cnn1d bprop fix * cnn1d stack fix * KerasModelEndToEndTest - Remove permutes for NWC and NHWC format tests Signed-off-by: Alex Black <blacka101@gmail.com> * Fixes and update test - input shapes (NCHW -> NHWC input) Signed-off-by: Alex Black <blacka101@gmail.com> * Ignore for known bad tests Signed-off-by: Alex Black <blacka101@gmail.com> * Multiple fixes - MergeVertex, CNN1D layers, etc Signed-off-by: Alex Black <blacka101@gmail.com> * Fix issue with RNN/FF preprocessors, time distributed etc with NWC format Signed-off-by: Alex Black <blacka101@gmail.com> * LSTM NWC dropout fix Signed-off-by: Alex Black <blacka101@gmail.com> * Add sequence embedding layer NWC support (configurable output format) Signed-off-by: Alex Black <blacka101@gmail.com> * Fix expected shape in a couple of tests - NWC expected Signed-off-by: Alex Black <blacka101@gmail.com> * Fix EmbeddingSequenceLayer backprop for NWC output case + add gradient checks Signed-off-by: Alex Black <blacka101@gmail.com> * CnnToFeedForwardPreprocessor: align with Keras/TF; fix Keras reshape/flatten Signed-off-by: Alex Black <blacka101@gmail.com> * Update ConvDataFormatTests to match new reshape behaviour Signed-off-by: Alex Black <blacka101@gmail.com> * Switch hard-coded path to ResourceUtils.listClassPathfiles for TestTFKerasModelImport Signed-off-by: Alex Black <blacka101@gmail.com> * TestUtils fix Signed-off-by: Alex Black <blacka101@gmail.com> * Fixes Signed-off-by: Alex Black <blacka101@gmail.com> * Fix JSON serde issue with data formats Signed-off-by: Alex Black <blacka101@gmail.com> * Fix for input dtype inference; fix 2 tests Signed-off-by: Alex Black <blacka101@gmail.com> * Test fixes Signed-off-by: Alex Black <blacka101@gmail.com> * #8891 Ignore for TestVertxUIMultiSession until fixed Signed-off-by: Alex Black <blacka101@gmail.com> * Restore but deprecate TensorFlowCnnToFeedForwardPreProcessor for older zoo models Signed-off-by: Alex Black <blacka101@gmail.com> * Ignore for deprecated preprocessor in DTypeTests Signed-off-by: Alex Black <blacka101@gmail.com> * Remove debug printlns Signed-off-by: Alex Black <blacka101@gmail.com> Co-authored-by: Alex Black <blacka101@gmail.com>
30 lines
1.1 KiB
Java
30 lines
1.1 KiB
Java
/*******************************************************************************
|
|
* Copyright (c) 2020 Konduit K.K.
|
|
*
|
|
* This program and the accompanying materials are made available under the
|
|
* terms of the Apache License, Version 2.0 which is available at
|
|
* https://www.apache.org/licenses/LICENSE-2.0.
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
* License for the specific language governing permissions and limitations
|
|
* under the License.
|
|
*
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
******************************************************************************/
|
|
|
|
|
|
package org.deeplearning4j.nn.conf;
|
|
|
|
/**
|
|
* NCW = "channels first" - arrays of shape [minibatch, channels, width]<br>
|
|
* NWC = "channels last" - arrays of shape [minibatch, width, channels]<br>
|
|
* "width" corresponds to sequence length and "channels" corresponds to sequence item size.
|
|
*/
|
|
|
|
public enum RNNFormat implements DataFormat {
|
|
NCW,
|
|
NWC
|
|
}
|