Merge pull request #3 from popoffka/fix-includes

Refactor includes

Author: madars

CMakeLists.txt

@@ -79,7 +79,7 @@ find_library(GMPXX_LIBRARIES NAMES gmpxx libgmpxx)
 
 # libff
 find_path(LIBFF_INCLUDE_DIR NAMES libff)
-include_directories(${LIBFF_INCLUDE_DIR}/libff)
+include_directories(${LIBFF_INCLUDE_DIR})
 find_library(LIBFF_LIBRARIES NAMES ff libff)
 
 # Google Test
@@ -102,5 +102,5 @@ add_custom_target(
 )
 
 include_directories(.)
-add_subdirectory(src)
-add_subdirectory(tutorials)
+add_subdirectory(libfqfft)
+add_subdirectory(tutorials)

README.md

@@ -1,5 +1,3 @@
-include_directories(.)
-
 install(
   DIRECTORY "" DESTINATION "include/libfqfft"
   FILES_MATCHING
@@ -15,10 +13,10 @@ add_executable(
   gtests
   EXCLUDE_FROM_ALL
 
-  ${CMAKE_HOME_DIRECTORY}/src/tests/init_test
-  ${CMAKE_HOME_DIRECTORY}/src/tests/evaluation_domain_test
-  ${CMAKE_HOME_DIRECTORY}/src/tests/polynomial_arithmetic_test
-  ${CMAKE_HOME_DIRECTORY}/src/tests/kronecker_substitution_test
+  tests/init_test
+  tests/evaluation_domain_test
+  tests/polynomial_arithmetic_test
+  tests/kronecker_substitution_test
 )
 target_link_libraries(
   gtests
@@ -34,7 +32,7 @@ target_link_libraries(
 add_executable(
   profiling_menu
 
-  ${CMAKE_HOME_DIRECTORY}/src/profiling/profiling_menu.cpp
+  profiling/profiling_menu.cpp
 )
 set_target_properties(
   profiling_menu
@@ -47,7 +45,7 @@ set_target_properties(
 add_executable(
   profiler
 
-  ${CMAKE_HOME_DIRECTORY}/src/profiling/profile/profile.cpp
+  profiling/profile/profile.cpp
 )
 target_compile_definitions(
   profiler
@@ -90,4 +88,4 @@ add_test(
   COMMAND gtests
 )
 
-add_dependencies(check gtests)
+add_dependencies(check gtests)

src/CMakeLists.txt renamed to libfqfft/CMakeLists.txt

@@ -14,7 +14,7 @@
 #ifndef ARITHMETIC_SEQUENCE_DOMAIN_HPP
 #define ARITHMETIC_SEQUENCE_DOMAIN_HPP
 
-#include "../evaluation_domain.hpp"
+#include <libfqfft/evaluation_domain/evaluation_domain.hpp>
 
 namespace libfqfft {
 
@@ -44,6 +44,6 @@ namespace libfqfft {
 
 } // libfqfft
 
-#include "arithmetic_sequence_domain.tcc"
+#include <libfqfft/evaluation_domain/domains/arithmetic_sequence_domain.tcc>
 
 #endif // ARITHMETIC_SEQUENCE_DOMAIN_HPP

src/evaluation_domain/domains/arithmetic_sequence_domain.hpp renamed to libfqfft/evaluation_domain/domains/arithmetic_sequence_domain.hpp

@@ -14,8 +14,8 @@
 #ifndef ARITHMETIC_SEQUENCE_DOMAIN_TCC_
 #define ARITHMETIC_SEQUENCE_DOMAIN_TCC_
 
-#include "basic_radix2_domain_aux.hpp"
-#include "../../polynomial_arithmetic/basis_change.hpp"
+#include <libfqfft/evaluation_domain/domains/basic_radix2_domain_aux.hpp>
+#include <libfqfft/polynomial_arithmetic/basis_change.hpp>
 
 #ifdef MULTICORE
 #include <omp.h>

src/evaluation_domain/domains/arithmetic_sequence_domain.tcc renamed to libfqfft/evaluation_domain/domains/arithmetic_sequence_domain.tcc

@@ -14,7 +14,7 @@
 #ifndef BASIC_RADIX2_DOMAIN_HPP_
 #define BASIC_RADIX2_DOMAIN_HPP_
 
-#include "../evaluation_domain.hpp"
+#include <libfqfft/evaluation_domain/evaluation_domain.hpp>
 
 namespace libfqfft {
 
@@ -40,6 +40,6 @@ class basic_radix2_domain : public evaluation_domain<FieldT> {
 
 } // libfqfft
 
-#include "basic_radix2_domain.tcc"
+#include <libfqfft/evaluation_domain/domains/basic_radix2_domain.tcc>
 
 #endif // BASIC_RADIX2_DOMAIN_HPP_

src/evaluation_domain/domains/basic_radix2_domain.hpp renamed to libfqfft/evaluation_domain/domains/basic_radix2_domain.hpp

@@ -14,7 +14,7 @@
 #ifndef BASIC_RADIX2_DOMAIN_TCC_
 #define BASIC_RADIX2_DOMAIN_TCC_
 
-#include "basic_radix2_domain_aux.hpp"
+#include <libfqfft/evaluation_domain/domains/basic_radix2_domain_aux.hpp>
 
 namespace libfqfft {
 

src/evaluation_domain/domains/basic_radix2_domain.tcc renamed to libfqfft/evaluation_domain/domains/basic_radix2_domain.tcc

@@ -43,6 +43,6 @@ std::vector<FieldT> _basic_radix2_evaluate_all_lagrange_polynomials(const size_t
 
 } // libfqfft
 
-#include "basic_radix2_domain_aux.tcc"
+#include <libfqfft/evaluation_domain/domains/basic_radix2_domain_aux.tcc>
 
 #endif // BASIC_RADIX2_DOMAIN_AUX_HPP_

src/evaluation_domain/domains/basic_radix2_domain_aux.hpp renamed to libfqfft/evaluation_domain/domains/basic_radix2_domain_aux.hpp

@@ -20,9 +20,9 @@
 #include <omp.h>
 #endif
 
-#include "algebra/fields/field_utils.hpp"
+#include <libff/algebra/fields/field_utils.hpp>
 
-#include "../../tools/exceptions.hpp"
+#include <libfqfft/tools/exceptions.hpp>
 
 namespace libfqfft {
 

src/evaluation_domain/domains/basic_radix2_domain_aux.tcc renamed to libfqfft/evaluation_domain/domains/basic_radix2_domain_aux.tcc

@@ -15,7 +15,7 @@
 #ifndef EXTENDED_RADIX2_DOMAIN_HPP_
 #define EXTENDED_RADIX2_DOMAIN_HPP_
 
-#include "../evaluation_domain.hpp"
+#include <libfqfft/evaluation_domain/evaluation_domain.hpp>
 
 namespace libfqfft {
 
@@ -43,6 +43,6 @@ class extended_radix2_domain : public evaluation_domain<FieldT> {
 
 } // libfqfft
 
-#include "extended_radix2_domain.tcc"
+#include <libfqfft/evaluation_domain/domains/extended_radix2_domain.tcc>
 
 #endif // EXTENDED_RADIX2_DOMAIN_HPP_