Added operations for CPU (#7)

* Operations have been added to core for CPU
bits2zbytes · Feb 16, 2020 · f104191 · f104191
1 parent 8f6bbe9
commit f104191
Show file tree

Hide file tree

Showing 11 changed files with 982 additions and 16 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,10 +8,12 @@ before_scirpt:
   - cd ../
   - wget https://cmake.org/files/v3.10/cmake-3.10.2-Linux-x86_64.tar.gz
   - tar -zxvf cmake-3.10.2-Linux-x86_64.tar.gz
-  - git clone https://github.com/google/googletest
+  - wget https://github.com/google/googletest/archive/release-1.10.0.tar.gz
+  - tar -zxvf release-1.10.0.tar.gz
+  - ls -a
   - mkdir googletest-build
   - cd googletest-build
-  - sudo ../cmake-3.10.2-Linux-x86_64/bin/cmake ../googletest
+  - sudo ../cmake-3.10.2-Linux-x86_64/bin/cmake ../googletest-release-1.10.0
   - sudo make -j5
   - sudo make install
   - cd ../
@@ -21,4 +23,4 @@ before_scirpt:
   - sudo make -j5
 
 script:
-  - ./bin/*
+  - ./bin/test_core
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -34,7 +34,7 @@ install(DIRECTORY adaboost DESTINATION ${CMAKE_INSTALL_PREFIX}/include
         PATTERN "*.cpp" EXCLUDE
         PATTERN "tests" EXCLUDE
         )
-install(DIRECTORY
+install(FILES
         ${CMAKE_BINARY_DIR}/libs/libadaboost_core.so
         ${CMAKE_BINARY_DIR}/libs/libadaboost_utils.so
         DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
diff --git a/adaboost/CMakeLists.txt b/adaboost/CMakeLists.txt
@@ -2,10 +2,11 @@ include_directories(utils core)
 add_library(adaboost_utils SHARED
             utils/utils_impl.cpp)
 add_library(adaboost_core SHARED
-            core/data_structures_impl.cpp)
+            core/data_structures_impl.cpp
+            core/operations_impl.cpp)
 if(BUILD_TESTS)
     set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
-    set(LINK_LIBRARIES gtest gtest_main pthread)
-    add_executable(test_data_structures tests/test_data_structures.cpp)
-    target_link_libraries(test_data_structures ${LINK_LIBRARIES} adaboost_core adaboost_utils)
+    set(LINK_LIBRARIES gtest gtest_main pthread adaboost_core adaboost_utils)
+    add_executable(test_core tests/test_core.cpp)
+    target_link_libraries(test_core ${LINK_LIBRARIES})
 endif()
diff --git a/adaboost/core/data_structures.hpp b/adaboost/core/data_structures.hpp
@@ -216,6 +216,7 @@ namespace adaboost
         void multiply(const Matrix<data_type_matrix>& mat1,
                       const Matrix<data_type_matrix>& mat2,
                       Matrix<data_type_matrix>& result);
+
     } // namespace core
 } // namespace adaboost
 

diff --git a/adaboost/core/data_structures_impl.cpp b/adaboost/core/data_structures_impl.cpp
@@ -1,5 +1,5 @@
-#ifndef ADABOOST_CORE_DATA_STRUCTURES_CPP
-#define ADABOOST_CORE_DATA_STRUCTURES_CPP
+#ifndef ADABOOST_CORE_DATA_STRUCTURES_IMPL_CPP
+#define ADABOOST_CORE_DATA_STRUCTURES_IMPL_CPP
 
 #include<adaboost/core/data_structures.hpp>
 #include<adaboost/utils/utils.hpp>