Merge pull request #3 from mir-group/david/development

Minor changes for compiling on Ubuntu
mir-group · Feb 20, 2020 · 638d9de · 638d9de
2 parents cf08afd + fa6e448
commit 638d9de
Show file tree

Hide file tree

Showing 14 changed files with 14 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -16,7 +16,7 @@ endif()
 
 set(CMAKE_CXX_FLAGS_RELEASE "-O3")
 
-find_package(Eigen3)
+find_package(Eigen3 REQUIRED)
 INCLUDE_DIRECTORIES ("${EIGEN3_INCLUDE_DIR}")
 
 set(ACE_ROOT_DIR $ENV{ACE})
@@ -27,7 +27,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED True)
 
 # add subdirectories
 add_subdirectory(src)
-add_subdirectory(test)
+add_subdirectory(tests)
 add_subdirectory(timing)
 add_subdirectory(pybind11)
 add_subdirectory(googletest)

diff --git a/README b/README
@@ -0,0 +1,6 @@
+## ACE
+
+# Usage
+
+- Clone with recursive
+- Set ACE environment variable
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -0,0 +1,6 @@
+# make executable
+add_executable(tests test_main.cpp test_y_grad.cpp test_radial.cpp
+ test_structure.cpp test_local_environment.cpp test_bond_env.cpp
+ test_descriptor.cpp test_kernels.cpp test_sparse_gp.cpp)
+target_include_directories(tests PUBLIC ${ACE_INCLUDE_DIR})
+target_link_libraries(tests PUBLIC gtest gtest_main Ace)
diff --git a/test/test_bond_env.cpp → tests/test_bond_env.cpp b/test/test_bond_env.cpp → tests/test_bond_env.cpp
diff --git a/test/test_descriptor.cpp → tests/test_descriptor.cpp b/test/test_descriptor.cpp → tests/test_descriptor.cpp
diff --git a/test/test_kernels.cpp → tests/test_kernels.cpp b/test/test_kernels.cpp → tests/test_kernels.cpp
diff --git a/test/test_local_environment.cpp → tests/test_local_environment.cpp b/test/test_local_environment.cpp → tests/test_local_environment.cpp
diff --git a/test/test_main.cpp → tests/test_main.cpp b/test/test_main.cpp → tests/test_main.cpp
diff --git a/test/test_nn.py → tests/test_nn.py b/test/test_nn.py → tests/test_nn.py
diff --git a/test/test_radial.cpp → tests/test_radial.cpp b/test/test_radial.cpp → tests/test_radial.cpp
diff --git a/test/test_sparse_gp.cpp → tests/test_sparse_gp.cpp b/test/test_sparse_gp.cpp → tests/test_sparse_gp.cpp
diff --git a/test/test_structure.cpp → tests/test_structure.cpp b/test/test_structure.cpp → tests/test_structure.cpp
diff --git a/test/test_y_grad.cpp → tests/test_y_grad.cpp b/test/test_y_grad.cpp → tests/test_y_grad.cpp