move Layer and Model from engine folder

src/layers/advanced_activations/ELU.js

@@ -1,4 +1,4 @@
-import Layer from '../../engine/Layer'
+import Layer from '../../Layer'
 import cwise from 'cwise'
 
 /**

src/layers/advanced_activations/LeakyReLU.js

@@ -1,4 +1,4 @@
-import Layer from '../../engine/Layer'
+import Layer from '../../Layer'
 import { relu } from '../../activations'
 
 /**

src/layers/advanced_activations/PReLU.js

@@ -1,4 +1,4 @@
-import Layer from '../../engine/Layer'
+import Layer from '../../Layer'
 import cwise from 'cwise'
 
 /**

src/layers/advanced_activations/ParametricSoftplus.js

@@ -1,4 +1,4 @@
-import Layer from '../../engine/Layer'
+import Layer from '../../Layer'
 import cwise from 'cwise'
 
 /**

src/layers/advanced_activations/SReLU.js

@@ -1,4 +1,4 @@
-import Layer from '../../engine/Layer'
+import Layer from '../../Layer'
 import cwise from 'cwise'
 
 /**

src/layers/advanced_activations/ThresholdedReLU.js

@@ -1,4 +1,4 @@
-import Layer from '../../engine/Layer'
+import Layer from '../../Layer'
 import cwise from 'cwise'
 
 /**

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'

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'

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'

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'

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'
 

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'
 

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'
 

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'
 

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'
 

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'
 

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'
 

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

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'
 

src/layers/core/Dropout.js

@@ -1,4 +1,4 @@
-import Layer from '../../engine/Layer'
+import Layer from '../../Layer'
 
 /**
  * Dropout layer class

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'

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'

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'
 

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'

src/layers/core/Permute.js

@@ -1,4 +1,4 @@
-import Layer from '../../engine/Layer'
+import Layer from '../../Layer'
 
 /**
  * Permute layer class

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'
 

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'

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'
 

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'

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'
 

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'
 

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'
 

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'
 

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'
 

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'
 

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'