From 9fe4daa1487f09a11a70e675f0e65e94f59c97c0 Mon Sep 17 00:00:00 2001 From: Leon Chen Date: Sat, 17 Sep 2016 13:07:47 -0400 Subject: [PATCH] move Layer and Model from engine folder --- src/{engine => }/Layer.js | 0 src/layers/advanced_activations/ELU.js | 2 +- src/layers/advanced_activations/LeakyReLU.js | 2 +- src/layers/advanced_activations/PReLU.js | 2 +- src/layers/advanced_activations/ParametricSoftplus.js | 2 +- src/layers/advanced_activations/SReLU.js | 2 +- src/layers/advanced_activations/ThresholdedReLU.js | 2 +- src/layers/convolutional/Convolution1D.js | 2 +- src/layers/convolutional/Convolution2D.js | 2 +- src/layers/convolutional/Convolution3D.js | 2 +- src/layers/convolutional/Deconvolution2D.js | 2 +- src/layers/convolutional/SeparableConvolution2D.js | 2 +- src/layers/convolutional/UpSampling1D.js | 2 +- src/layers/convolutional/UpSampling2D.js | 2 +- src/layers/convolutional/UpSampling3D.js | 2 +- src/layers/convolutional/ZeroPadding1D.js | 2 +- src/layers/convolutional/ZeroPadding2D.js | 2 +- src/layers/convolutional/ZeroPadding3D.js | 2 +- src/layers/core/Activation.js | 2 +- src/layers/core/Dense.js | 2 +- src/layers/core/Dropout.js | 2 +- src/layers/core/Flatten.js | 2 +- src/layers/core/Highway.js | 2 +- src/layers/core/MaxoutDense.js | 2 +- src/layers/core/Merge.js | 2 +- src/layers/core/Permute.js | 2 +- src/layers/core/RepeatVector.js | 2 +- src/layers/core/Reshape.js | 2 +- src/layers/embeddings/Embedding.js | 2 +- src/layers/normalization/BatchNormalization.js | 2 +- src/layers/pooling/GlobalAveragePooling1D.js | 2 +- src/layers/pooling/GlobalAveragePooling2D.js | 2 +- src/layers/pooling/GlobalMaxPooling1D.js | 2 +- src/layers/pooling/GlobalMaxPooling2D.js | 2 +- src/layers/pooling/_Pooling1D.js | 2 +- src/layers/pooling/_Pooling2D.js | 2 +- src/layers/pooling/_Pooling3D.js | 2 +- 37 files changed, 36 insertions(+), 36 deletions(-) rename src/{engine => }/Layer.js (100%) diff --git a/src/engine/Layer.js b/src/Layer.js similarity index 100% rename from src/engine/Layer.js rename to src/Layer.js diff --git a/src/layers/advanced_activations/ELU.js b/src/layers/advanced_activations/ELU.js index b5d8a4e..b834d21 100644 --- a/src/layers/advanced_activations/ELU.js +++ b/src/layers/advanced_activations/ELU.js @@ -1,4 +1,4 @@ -import Layer from '../../engine/Layer' +import Layer from '../../Layer' import cwise from 'cwise' /** diff --git a/src/layers/advanced_activations/LeakyReLU.js b/src/layers/advanced_activations/LeakyReLU.js index 41b6bda..0be772a 100644 --- a/src/layers/advanced_activations/LeakyReLU.js +++ b/src/layers/advanced_activations/LeakyReLU.js @@ -1,4 +1,4 @@ -import Layer from '../../engine/Layer' +import Layer from '../../Layer' import { relu } from '../../activations' /** diff --git a/src/layers/advanced_activations/PReLU.js b/src/layers/advanced_activations/PReLU.js index 8d26188..8c6efe0 100644 --- a/src/layers/advanced_activations/PReLU.js +++ b/src/layers/advanced_activations/PReLU.js @@ -1,4 +1,4 @@ -import Layer from '../../engine/Layer' +import Layer from '../../Layer' import cwise from 'cwise' /** diff --git a/src/layers/advanced_activations/ParametricSoftplus.js b/src/layers/advanced_activations/ParametricSoftplus.js index f01ccd6..6c47c5f 100644 --- a/src/layers/advanced_activations/ParametricSoftplus.js +++ b/src/layers/advanced_activations/ParametricSoftplus.js @@ -1,4 +1,4 @@ -import Layer from '../../engine/Layer' +import Layer from '../../Layer' import cwise from 'cwise' /** diff --git a/src/layers/advanced_activations/SReLU.js b/src/layers/advanced_activations/SReLU.js index 00cc56f..5b54e91 100644 --- a/src/layers/advanced_activations/SReLU.js +++ b/src/layers/advanced_activations/SReLU.js @@ -1,4 +1,4 @@ -import Layer from '../../engine/Layer' +import Layer from '../../Layer' import cwise from 'cwise' /** diff --git a/src/layers/advanced_activations/ThresholdedReLU.js b/src/layers/advanced_activations/ThresholdedReLU.js index b58b2d9..287e33f 100644 --- a/src/layers/advanced_activations/ThresholdedReLU.js +++ b/src/layers/advanced_activations/ThresholdedReLU.js @@ -1,4 +1,4 @@ -import Layer from '../../engine/Layer' +import Layer from '../../Layer' import cwise from 'cwise' /** diff --git a/src/layers/convolutional/Convolution1D.js b/src/layers/convolutional/Convolution1D.js index b2895b6..cabbfb2 100644 --- a/src/layers/convolutional/Convolution1D.js +++ b/src/layers/convolutional/Convolution1D.js @@ -1,4 +1,4 @@ -import Layer from '../../engine/Layer' +import Layer from '../../Layer' import Convolution2D from './Convolution2D' import squeeze from 'ndarray-squeeze' import unsqueeze from 'ndarray-unsqueeze' diff --git a/src/layers/convolutional/Convolution2D.js b/src/layers/convolutional/Convolution2D.js index ff8c773..2904f00 100644 --- a/src/layers/convolutional/Convolution2D.js +++ b/src/layers/convolutional/Convolution2D.js @@ -1,6 +1,6 @@ import * as activations from '../../activations' import Tensor from '../../Tensor' -import Layer from '../../engine/Layer' +import Layer from '../../Layer' import ops from 'ndarray-ops' import gemm from 'ndarray-gemm' import unpack from 'ndarray-unpack' diff --git a/src/layers/convolutional/Convolution3D.js b/src/layers/convolutional/Convolution3D.js index cc63a60..56c0459 100644 --- a/src/layers/convolutional/Convolution3D.js +++ b/src/layers/convolutional/Convolution3D.js @@ -1,6 +1,6 @@ import * as activations from '../../activations' import Tensor from '../../Tensor' -import Layer from '../../engine/Layer' +import Layer from '../../Layer' import ops from 'ndarray-ops' import gemm from 'ndarray-gemm' import unpack from 'ndarray-unpack' diff --git a/src/layers/convolutional/Deconvolution2D.js b/src/layers/convolutional/Deconvolution2D.js index 85448eb..36528cf 100644 --- a/src/layers/convolutional/Deconvolution2D.js +++ b/src/layers/convolutional/Deconvolution2D.js @@ -1,6 +1,6 @@ import * as activations from '../../activations' import Tensor from '../../Tensor' -import Layer from '../../engine/Layer' +import Layer from '../../Layer' import ops from 'ndarray-ops' import gemm from 'ndarray-gemm' import unpack from 'ndarray-unpack' diff --git a/src/layers/convolutional/SeparableConvolution2D.js b/src/layers/convolutional/SeparableConvolution2D.js index fff0271..464660a 100644 --- a/src/layers/convolutional/SeparableConvolution2D.js +++ b/src/layers/convolutional/SeparableConvolution2D.js @@ -1,6 +1,6 @@ import * as activations from '../../activations' import Tensor from '../../Tensor' -import Layer from '../../engine/Layer' +import Layer from '../../Layer' import Convolution2D from './Convolution2D' import ops from 'ndarray-ops' diff --git a/src/layers/convolutional/UpSampling1D.js b/src/layers/convolutional/UpSampling1D.js index 9acfeed..c6dd783 100644 --- a/src/layers/convolutional/UpSampling1D.js +++ b/src/layers/convolutional/UpSampling1D.js @@ -1,4 +1,4 @@ -import Layer from '../../engine/Layer' +import Layer from '../../Layer' import Tensor from '../../Tensor' import ops from 'ndarray-ops' diff --git a/src/layers/convolutional/UpSampling2D.js b/src/layers/convolutional/UpSampling2D.js index 0bc65bd..38927a5 100644 --- a/src/layers/convolutional/UpSampling2D.js +++ b/src/layers/convolutional/UpSampling2D.js @@ -1,4 +1,4 @@ -import Layer from '../../engine/Layer' +import Layer from '../../Layer' import Tensor from '../../Tensor' import ops from 'ndarray-ops' diff --git a/src/layers/convolutional/UpSampling3D.js b/src/layers/convolutional/UpSampling3D.js index fb0db30..4b84df3 100644 --- a/src/layers/convolutional/UpSampling3D.js +++ b/src/layers/convolutional/UpSampling3D.js @@ -1,4 +1,4 @@ -import Layer from '../../engine/Layer' +import Layer from '../../Layer' import Tensor from '../../Tensor' import ops from 'ndarray-ops' diff --git a/src/layers/convolutional/ZeroPadding1D.js b/src/layers/convolutional/ZeroPadding1D.js index d0c59ef..33b7725 100644 --- a/src/layers/convolutional/ZeroPadding1D.js +++ b/src/layers/convolutional/ZeroPadding1D.js @@ -1,4 +1,4 @@ -import Layer from '../../engine/Layer' +import Layer from '../../Layer' import Tensor from '../../Tensor' import ops from 'ndarray-ops' diff --git a/src/layers/convolutional/ZeroPadding2D.js b/src/layers/convolutional/ZeroPadding2D.js index 466bf39..6e2b3b1 100644 --- a/src/layers/convolutional/ZeroPadding2D.js +++ b/src/layers/convolutional/ZeroPadding2D.js @@ -1,4 +1,4 @@ -import Layer from '../../engine/Layer' +import Layer from '../../Layer' import Tensor from '../../Tensor' import ops from 'ndarray-ops' diff --git a/src/layers/convolutional/ZeroPadding3D.js b/src/layers/convolutional/ZeroPadding3D.js index 30c3ec2..6358aa8 100644 --- a/src/layers/convolutional/ZeroPadding3D.js +++ b/src/layers/convolutional/ZeroPadding3D.js @@ -1,4 +1,4 @@ -import Layer from '../../engine/Layer' +import Layer from '../../Layer' import Tensor from '../../Tensor' import ops from 'ndarray-ops' diff --git a/src/layers/core/Activation.js b/src/layers/core/Activation.js index 6207610..4bda0ba 100644 --- a/src/layers/core/Activation.js +++ b/src/layers/core/Activation.js @@ -1,5 +1,5 @@ import * as activations from '../../activations' -import Layer from '../../engine/Layer' +import Layer from '../../Layer' /** * Activation layer class diff --git a/src/layers/core/Dense.js b/src/layers/core/Dense.js index 02dd963..eb36e3f 100644 --- a/src/layers/core/Dense.js +++ b/src/layers/core/Dense.js @@ -1,6 +1,6 @@ import * as activations from '../../activations' import Tensor from '../../Tensor' -import Layer from '../../engine/Layer' +import Layer from '../../Layer' import { gemv } from 'ndarray-blas-level2' import ops from 'ndarray-ops' diff --git a/src/layers/core/Dropout.js b/src/layers/core/Dropout.js index bede188..b637d8d 100644 --- a/src/layers/core/Dropout.js +++ b/src/layers/core/Dropout.js @@ -1,4 +1,4 @@ -import Layer from '../../engine/Layer' +import Layer from '../../Layer' /** * Dropout layer class diff --git a/src/layers/core/Flatten.js b/src/layers/core/Flatten.js index 3e85f2f..8912d6f 100644 --- a/src/layers/core/Flatten.js +++ b/src/layers/core/Flatten.js @@ -1,4 +1,4 @@ -import Layer from '../../engine/Layer' +import Layer from '../../Layer' import ndarray from 'ndarray' import unpack from 'ndarray-unpack' import flattenDeep from 'lodash/flattenDeep' diff --git a/src/layers/core/Highway.js b/src/layers/core/Highway.js index e5f62fb..555a44c 100644 --- a/src/layers/core/Highway.js +++ b/src/layers/core/Highway.js @@ -1,6 +1,6 @@ import * as activations from '../../activations' import Tensor from '../../Tensor' -import Layer from '../../engine/Layer' +import Layer from '../../Layer' import { gemv } from 'ndarray-blas-level2' import ops from 'ndarray-ops' import cwise from 'cwise' diff --git a/src/layers/core/MaxoutDense.js b/src/layers/core/MaxoutDense.js index 41638f9..2c11be4 100644 --- a/src/layers/core/MaxoutDense.js +++ b/src/layers/core/MaxoutDense.js @@ -1,5 +1,5 @@ import Tensor from '../../Tensor' -import Layer from '../../engine/Layer' +import Layer from '../../Layer' import { gemv } from 'ndarray-blas-level2' import ops from 'ndarray-ops' diff --git a/src/layers/core/Merge.js b/src/layers/core/Merge.js index cf2a002..dc5b490 100644 --- a/src/layers/core/Merge.js +++ b/src/layers/core/Merge.js @@ -1,5 +1,5 @@ import Tensor from '../../Tensor' -import Layer from '../../engine/Layer' +import Layer from '../../Layer' import gemm from 'ndarray-gemm' import ops from 'ndarray-ops' import unsqueeze from 'ndarray-unsqueeze' diff --git a/src/layers/core/Permute.js b/src/layers/core/Permute.js index 63abd78..c71e292 100644 --- a/src/layers/core/Permute.js +++ b/src/layers/core/Permute.js @@ -1,4 +1,4 @@ -import Layer from '../../engine/Layer' +import Layer from '../../Layer' /** * Permute layer class diff --git a/src/layers/core/RepeatVector.js b/src/layers/core/RepeatVector.js index 0951c6f..329aec0 100644 --- a/src/layers/core/RepeatVector.js +++ b/src/layers/core/RepeatVector.js @@ -1,4 +1,4 @@ -import Layer from '../../engine/Layer' +import Layer from '../../Layer' import unsqueeze from 'ndarray-unsqueeze' import tile from 'ndarray-tile' diff --git a/src/layers/core/Reshape.js b/src/layers/core/Reshape.js index 513db34..8fee418 100644 --- a/src/layers/core/Reshape.js +++ b/src/layers/core/Reshape.js @@ -1,4 +1,4 @@ -import Layer from '../../engine/Layer' +import Layer from '../../Layer' import ndarray from 'ndarray' import unpack from 'ndarray-unpack' import flattenDeep from 'lodash/flattenDeep' diff --git a/src/layers/embeddings/Embedding.js b/src/layers/embeddings/Embedding.js index 940fd45..c7b462b 100644 --- a/src/layers/embeddings/Embedding.js +++ b/src/layers/embeddings/Embedding.js @@ -1,4 +1,4 @@ -import Layer from '../../engine/Layer' +import Layer from '../../Layer' import Tensor from '../../Tensor' import ops from 'ndarray-ops' diff --git a/src/layers/normalization/BatchNormalization.js b/src/layers/normalization/BatchNormalization.js index c1d472b..36ef0e1 100644 --- a/src/layers/normalization/BatchNormalization.js +++ b/src/layers/normalization/BatchNormalization.js @@ -1,4 +1,4 @@ -import Layer from '../../engine/Layer' +import Layer from '../../Layer' import Tensor from '../../Tensor' import ops from 'ndarray-ops' import unpack from 'ndarray-unpack' diff --git a/src/layers/pooling/GlobalAveragePooling1D.js b/src/layers/pooling/GlobalAveragePooling1D.js index 72b9b92..2ae1f0b 100644 --- a/src/layers/pooling/GlobalAveragePooling1D.js +++ b/src/layers/pooling/GlobalAveragePooling1D.js @@ -1,4 +1,4 @@ -import Layer from '../../engine/Layer' +import Layer from '../../Layer' import Tensor from '../../Tensor' import ops from 'ndarray-ops' diff --git a/src/layers/pooling/GlobalAveragePooling2D.js b/src/layers/pooling/GlobalAveragePooling2D.js index d629d82..7b76369 100644 --- a/src/layers/pooling/GlobalAveragePooling2D.js +++ b/src/layers/pooling/GlobalAveragePooling2D.js @@ -1,4 +1,4 @@ -import Layer from '../../engine/Layer' +import Layer from '../../Layer' import Tensor from '../../Tensor' import ops from 'ndarray-ops' diff --git a/src/layers/pooling/GlobalMaxPooling1D.js b/src/layers/pooling/GlobalMaxPooling1D.js index e6d2db8..f9fd8a6 100644 --- a/src/layers/pooling/GlobalMaxPooling1D.js +++ b/src/layers/pooling/GlobalMaxPooling1D.js @@ -1,4 +1,4 @@ -import Layer from '../../engine/Layer' +import Layer from '../../Layer' import Tensor from '../../Tensor' import ops from 'ndarray-ops' diff --git a/src/layers/pooling/GlobalMaxPooling2D.js b/src/layers/pooling/GlobalMaxPooling2D.js index dbb66e4..fd1e389 100644 --- a/src/layers/pooling/GlobalMaxPooling2D.js +++ b/src/layers/pooling/GlobalMaxPooling2D.js @@ -1,4 +1,4 @@ -import Layer from '../../engine/Layer' +import Layer from '../../Layer' import Tensor from '../../Tensor' import ops from 'ndarray-ops' diff --git a/src/layers/pooling/_Pooling1D.js b/src/layers/pooling/_Pooling1D.js index e1c084c..44e9863 100644 --- a/src/layers/pooling/_Pooling1D.js +++ b/src/layers/pooling/_Pooling1D.js @@ -1,4 +1,4 @@ -import Layer from '../../engine/Layer' +import Layer from '../../Layer' import Tensor from '../../Tensor' import ops from 'ndarray-ops' diff --git a/src/layers/pooling/_Pooling2D.js b/src/layers/pooling/_Pooling2D.js index c7a92ff..8ddf056 100644 --- a/src/layers/pooling/_Pooling2D.js +++ b/src/layers/pooling/_Pooling2D.js @@ -1,4 +1,4 @@ -import Layer from '../../engine/Layer' +import Layer from '../../Layer' import Tensor from '../../Tensor' import ops from 'ndarray-ops' diff --git a/src/layers/pooling/_Pooling3D.js b/src/layers/pooling/_Pooling3D.js index c14dbaa..3a7845a 100644 --- a/src/layers/pooling/_Pooling3D.js +++ b/src/layers/pooling/_Pooling3D.js @@ -1,4 +1,4 @@ -import Layer from '../../engine/Layer' +import Layer from '../../Layer' import Tensor from '../../Tensor' import ops from 'ndarray-ops'