man I am changing ideas so fast.

diff --git a/src/Makefile b/src/Makefile
index b8c9dcc..ec67810 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -8,7 +8,7 @@
 PROJECT := caffeine
 NAME := lib$(PROJECT).so
 TEST_NAME := test_$(PROJECT)
-CXX_SRCS := $(shell find caffeine ! -name "test_*.cpp" ! -name "_*.cpp" -name "*.cpp")
+CXX_SRCS := $(shell find caffeine ! -name "test_*.cpp" -name "*.cpp")
 TEST_SRCS := $(shell find caffeine -name "test_*.cpp") gtest/gtest-all.cpp
 PROTO_SRCS := $(wildcard caffeine/proto/*.proto)
 PROTO_GEN_HEADER := ${PROTO_SRCS:.proto=.pb.h}

diff --git a/src/caffeine/_blob.cpp b/src/caffeine/blob.cpp
similarity index 67%
rename from src/caffeine/_blob.cpp
rename to src/caffeine/blob.cpp
index 8eb95ab..580f5eb 100644 (file)
--- a/src/caffeine/_blob.cpp
+++ b/src/caffeine/blob.cpp
@@ -18,50 +18,50 @@ void Blob<Dtype>::Reshape(const int num, const int channels, const int height,
 
 template <typename Dtype>
 const Dtype* Blob<Dtype>::cpu_data() {
-  check_data();
-  return data_->cpu_data();
+  CHECK(data_);
+  return (const Dtype*)data_->cpu_data();
 }
 
 template <typename Dtype>
 const Dtype* Blob<Dtype>::gpu_data() {
-  check_data();
-  return data_->gpu_data();
+  CHECK(data_);
+  return (const Dtype*)data_->gpu_data();
 }
 
 template <typename Dtype>
 const Dtype* Blob<Dtype>::cpu_diff() {
-  check_diff();
-  return diff_->cpu_data();
+  CHECK(diff_);
+  return (const Dtype*)diff_->cpu_data();
 }
 
 template <typename Dtype>
 const Dtype* Blob<Dtype>::gpu_diff() {
-  check_diff();
-  return diff_->gpu_data();
+  CHECK(diff_);
+  return (const Dtype*)diff_->gpu_data();
 }
 
 template <typename Dtype>
 Dtype* Blob<Dtype>::mutable_cpu_data() {
-  check_data();
-  return data_->mutable_cpu_data();
+  CHECK(data_);
+  return (Dtype*)data_->mutable_cpu_data();
 }
 
 template <typename Dtype>
 Dtype* Blob<Dtype>::mutable_gpu_data() {
-  check_data();
-  return data_->mutable_gpu_data();
+  CHECK(data_);
+  return (Dtype*)data_->mutable_gpu_data();
 }
 
 template <typename Dtype>
 Dtype* Blob<Dtype>::mutable_cpu_diff() {
-  check_diff();
-  return diff_->mutable_cpu_data();
+  CHECK(diff_);
+  return (Dtype*)diff_->mutable_cpu_data();
 }
 
 template <typename Dtype>
 Dtype* Blob<Dtype>::mutable_gpu_diff() {
-  check_diff();
-  return diff_->mutable_gpu_data();
+  CHECK(diff_);
+  return (Dtype*)diff_->mutable_gpu_data();
 }
 
 template <typename Dtype>
@@ -69,5 +69,8 @@ void Blob<Dtype>::update() {
   
 }
 
+template class Blob<float>;
+template class Blob<double>;
+
 }  // namespace caffeine
 

diff --git a/src/caffeine/blob.hpp b/src/caffeine/blob.hpp
index a2e3131..5f0f3ee 100644 (file)
--- a/src/caffeine/blob.hpp
+++ b/src/caffeine/blob.hpp
@@ -37,8 +37,6 @@ class Blob {
   Dtype* mutable_gpu_diff();
   void update();
  private:
-  void check_data();
-  void check_diff();
   shared_ptr<SyncedMemory> data_;
   shared_ptr<SyncedMemory> diff_;
   int num_;
@@ -50,6 +48,4 @@ class Blob {
 
 }  // namespace caffeine
 
-#include "caffeine/_blob.cpp"
-
 #endif  // CAFFEINE_BLOB_HPP_