2 files changed, 1 insertions, 86 deletions
diff --git a/src/tensors/tensor.cu b/src/tensors/tensor.cu
index eec4be6b..bc26fcec 100644
--- a/src/tensors/tensor.cu
+++ b/src/tensors/tensor.cu
@@ -1,11 +1,8 @@
 
-#include <cuda.h>
-#include <thrust/device_ptr.h>
-#include <thrust/device_vector.h>
+#include "tensors/tensor.h"
 
 #include "kernels/cuda_helpers.h"
 #include "kernels/tensor_operators.h"
-#include "tensors/tensor.h"
 
 namespace marian {
 
diff --git a/src/tensors/tensor_cpu.h b/src/tensors/tensor_cpu.h
deleted file mode 100644
index 18725b3d..00000000
--- a/src/tensors/tensor_cpu.h
+++ /dev/null
@@ -1,82 +0,0 @@
-#pragma once
-
-// This file is part of the Marian toolkit.
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
-#include <cstring>
-
-#include "tensors/tensor.h"
-
-namespace marian {
-
-class TensorCPU : public TensorBase {
-public:
-  TensorCPU(float* data, Shape shape) : TensorBase(data, shape) {}
-
-  float get(size_t i) { return data_[i]; }
-
-  void set(size_t i, float value) { data_[i] = value; }
-
-  void get(std::vector<float>& v) {
-    v.resize(size());
-    std::copy(data_, data_ + size(), v.begin());
-  }
-
-  void set(float value) { std::fill(data_, data_ + size(), value); }
-
-  void set(const std::vector<float>& v) {
-    std::copy(v.begin(), v.end(), data_);
-  }
-};
-
-class DeviceCPU {
-private:
-  float* data_;
-  size_t size_
-
-      public : DeviceCPU()
-      : data_(0), size_(0) {}
-
-  ~DeviceCPU() {
-    if(data_)
-      delete[] data_;
-  }
-
-  typedef TensorCPU tensor_type;
-
-  void reserve(size_t size) {
-    ABORT_IF(size < size_, "New size must be larger than old size");
-    float* temp = new float[size];
-
-    if(data_) {
-      std::memcpy(temp, data_, size_ * sizeof(float));
-      delete[] data_;
-    }
-
-    data_ = temp;
-    size_ = size;
-  }
-
-  float* data() { return data_; }
-
-  size_t capacity() { return size_; }
-};
-}