Skip to content

Commit 43c472e

Browse files
authored
Merge pull request #3 from popoffka/fix-includes
Refactor includes
2 parents 08e7547 + a89c54a commit 43c472e

File tree

497 files changed

+105
-110
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

497 files changed

+105
-110
lines changed

CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ find_library(GMPXX_LIBRARIES NAMES gmpxx libgmpxx)
7979

8080
# libff
8181
find_path(LIBFF_INCLUDE_DIR NAMES libff)
82-
include_directories(${LIBFF_INCLUDE_DIR}/libff)
82+
include_directories(${LIBFF_INCLUDE_DIR})
8383
find_library(LIBFF_LIBRARIES NAMES ff libff)
8484

8585
# Google Test
@@ -102,5 +102,5 @@ add_custom_target(
102102
)
103103

104104
include_directories(.)
105-
add_subdirectory(src)
106-
add_subdirectory(tutorials)
105+
add_subdirectory(libfqfft)
106+
add_subdirectory(tutorials)

README.md

Lines changed: 12 additions & 12 deletions

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

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
include_directories(.)
2-
31
install(
42
DIRECTORY "" DESTINATION "include/libfqfft"
53
FILES_MATCHING
@@ -15,10 +13,10 @@ add_executable(
1513
gtests
1614
EXCLUDE_FROM_ALL
1715

18-
${CMAKE_HOME_DIRECTORY}/src/tests/init_test
19-
${CMAKE_HOME_DIRECTORY}/src/tests/evaluation_domain_test
20-
${CMAKE_HOME_DIRECTORY}/src/tests/polynomial_arithmetic_test
21-
${CMAKE_HOME_DIRECTORY}/src/tests/kronecker_substitution_test
16+
tests/init_test
17+
tests/evaluation_domain_test
18+
tests/polynomial_arithmetic_test
19+
tests/kronecker_substitution_test
2220
)
2321
target_link_libraries(
2422
gtests
@@ -34,7 +32,7 @@ target_link_libraries(
3432
add_executable(
3533
profiling_menu
3634

37-
${CMAKE_HOME_DIRECTORY}/src/profiling/profiling_menu.cpp
35+
profiling/profiling_menu.cpp
3836
)
3937
set_target_properties(
4038
profiling_menu
@@ -47,7 +45,7 @@ set_target_properties(
4745
add_executable(
4846
profiler
4947

50-
${CMAKE_HOME_DIRECTORY}/src/profiling/profile/profile.cpp
48+
profiling/profile/profile.cpp
5149
)
5250
target_compile_definitions(
5351
profiler
@@ -90,4 +88,4 @@ add_test(
9088
COMMAND gtests
9189
)
9290

93-
add_dependencies(check gtests)
91+
add_dependencies(check gtests)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#ifndef ARITHMETIC_SEQUENCE_DOMAIN_HPP
1515
#define ARITHMETIC_SEQUENCE_DOMAIN_HPP
1616

17-
#include "../evaluation_domain.hpp"
17+
#include <libfqfft/evaluation_domain/evaluation_domain.hpp>
1818

1919
namespace libfqfft {
2020

@@ -44,6 +44,6 @@ namespace libfqfft {
4444

4545
} // libfqfft
4646

47-
#include "arithmetic_sequence_domain.tcc"
47+
#include <libfqfft/evaluation_domain/domains/arithmetic_sequence_domain.tcc>
4848

4949
#endif // ARITHMETIC_SEQUENCE_DOMAIN_HPP

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
#ifndef ARITHMETIC_SEQUENCE_DOMAIN_TCC_
1515
#define ARITHMETIC_SEQUENCE_DOMAIN_TCC_
1616

17-
#include "basic_radix2_domain_aux.hpp"
18-
#include "../../polynomial_arithmetic/basis_change.hpp"
17+
#include <libfqfft/evaluation_domain/domains/basic_radix2_domain_aux.hpp>
18+
#include <libfqfft/polynomial_arithmetic/basis_change.hpp>
1919

2020
#ifdef MULTICORE
2121
#include <omp.h>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#ifndef BASIC_RADIX2_DOMAIN_HPP_
1515
#define BASIC_RADIX2_DOMAIN_HPP_
1616

17-
#include "../evaluation_domain.hpp"
17+
#include <libfqfft/evaluation_domain/evaluation_domain.hpp>
1818

1919
namespace libfqfft {
2020

@@ -40,6 +40,6 @@ class basic_radix2_domain : public evaluation_domain<FieldT> {
4040

4141
} // libfqfft
4242

43-
#include "basic_radix2_domain.tcc"
43+
#include <libfqfft/evaluation_domain/domains/basic_radix2_domain.tcc>
4444

4545
#endif // BASIC_RADIX2_DOMAIN_HPP_

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#ifndef BASIC_RADIX2_DOMAIN_TCC_
1515
#define BASIC_RADIX2_DOMAIN_TCC_
1616

17-
#include "basic_radix2_domain_aux.hpp"
17+
#include <libfqfft/evaluation_domain/domains/basic_radix2_domain_aux.hpp>
1818

1919
namespace libfqfft {
2020

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,6 @@ std::vector<FieldT> _basic_radix2_evaluate_all_lagrange_polynomials(const size_t
4343

4444
} // libfqfft
4545

46-
#include "basic_radix2_domain_aux.tcc"
46+
#include <libfqfft/evaluation_domain/domains/basic_radix2_domain_aux.tcc>
4747

4848
#endif // BASIC_RADIX2_DOMAIN_AUX_HPP_

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
#include <omp.h>
2121
#endif
2222

23-
#include "algebra/fields/field_utils.hpp"
23+
#include <libff/algebra/fields/field_utils.hpp>
2424

25-
#include "../../tools/exceptions.hpp"
25+
#include <libfqfft/tools/exceptions.hpp>
2626

2727
namespace libfqfft {
2828

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#ifndef EXTENDED_RADIX2_DOMAIN_HPP_
1616
#define EXTENDED_RADIX2_DOMAIN_HPP_
1717

18-
#include "../evaluation_domain.hpp"
18+
#include <libfqfft/evaluation_domain/evaluation_domain.hpp>
1919

2020
namespace libfqfft {
2121

@@ -43,6 +43,6 @@ class extended_radix2_domain : public evaluation_domain<FieldT> {
4343

4444
} // libfqfft
4545

46-
#include "extended_radix2_domain.tcc"
46+
#include <libfqfft/evaluation_domain/domains/extended_radix2_domain.tcc>
4747

4848
#endif // EXTENDED_RADIX2_DOMAIN_HPP_

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
#ifndef EXTENDED_RADIX2_DOMAIN_TCC_
1515

16-
#include "basic_radix2_domain_aux.hpp"
16+
#include <libfqfft/evaluation_domain/domains/basic_radix2_domain_aux.hpp>
1717

1818
namespace libfqfft {
1919

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#ifndef GEOMETRIC_SEQUENCE_DOMAIN_HPP
1515
#define GEOMETRIC_SEQUENCE_DOMAIN_HPP
1616

17-
#include "../evaluation_domain.hpp"
17+
#include <libfqfft/evaluation_domain/evaluation_domain.hpp>
1818

1919
namespace libfqfft {
2020

@@ -43,6 +43,6 @@ namespace libfqfft {
4343

4444
} // libfqfft
4545

46-
#include "geometric_sequence_domain.tcc"
46+
#include <libfqfft/evaluation_domain/domains/geometric_sequence_domain.tcc>
4747

4848
#endif // GEOMETRIC_SEQUENCE_DOMAIN_HPP

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
#ifndef GEOMETRIC_SEQUENCE_DOMAIN_TCC_
1515
#define GEOMETRIC_SEQUENCE_DOMAIN_TCC_
1616

17-
#include "basic_radix2_domain_aux.hpp"
18-
#include "../../polynomial_arithmetic/basis_change.hpp"
17+
#include <libfqfft/evaluation_domain/domains/basic_radix2_domain_aux.hpp>
18+
#include <libfqfft/polynomial_arithmetic/basis_change.hpp>
1919

2020
#ifdef MULTICORE
2121
#include <omp.h>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#ifndef STEP_RADIX2_DOMAIN_HPP_
1616
#define STEP_RADIX2_DOMAIN_HPP_
1717

18-
#include "../evaluation_domain.hpp"
18+
#include <libfqfft/evaluation_domain/evaluation_domain.hpp>
1919

2020
namespace libfqfft {
2121

@@ -45,6 +45,6 @@ class step_radix2_domain : public evaluation_domain<FieldT> {
4545

4646
} // libfqfft
4747

48-
#include "step_radix2_domain.tcc"
48+
#include <libfqfft/evaluation_domain/domains/step_radix2_domain.tcc>
4949

5050
#endif // STEP_RADIX2_DOMAIN_HPP_

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
#ifndef STEP_RADIX2_DOMAIN_TCC_
1515

16-
#include "basic_radix2_domain_aux.hpp"
16+
#include <libfqfft/evaluation_domain/domains/basic_radix2_domain_aux.hpp>
1717

1818
namespace libfqfft {
1919

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,6 @@ std::shared_ptr<evaluation_domain<FieldT> > get_evaluation_domain(const size_t m
107107

108108
} // libfqfft
109109

110-
#include "evaluation_domain.tcc"
110+
#include <libfqfft/evaluation_domain/evaluation_domain.tcc>
111111

112112
#endif // EVALUATION_DOMAIN_HPP_

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919
#ifndef EVALUATION_DOMAIN_TCC_
2020
#define EVALUATION_DOMAIN_TCC_
2121

22-
#include "domains/basic_radix2_domain.hpp"
23-
#include "domains/extended_radix2_domain.hpp"
24-
#include "domains/step_radix2_domain.hpp"
25-
#include "domains/arithmetic_sequence_domain.hpp"
26-
#include "domains/geometric_sequence_domain.hpp"
22+
#include <libfqfft/evaluation_domain/domains/basic_radix2_domain.hpp>
23+
#include <libfqfft/evaluation_domain/domains/extended_radix2_domain.hpp>
24+
#include <libfqfft/evaluation_domain/domains/step_radix2_domain.hpp>
25+
#include <libfqfft/evaluation_domain/domains/arithmetic_sequence_domain.hpp>
26+
#include <libfqfft/evaluation_domain/domains/geometric_sequence_domain.hpp>
2727

28-
#include "../tools/exceptions.hpp"
28+
#include <libfqfft/tools/exceptions.hpp>
2929

3030
namespace libfqfft {
3131

src/kronecker_substitution/kronecker_substitution.hpp renamed to libfqfft/kronecker_substitution/kronecker_substitution.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@ void kronecker_substitution(std::vector<FieldT> &v3, const std::vector<FieldT> &
2626

2727
} // libfqfft
2828

29-
#include "kronecker_substitution.tcc"
29+
#include <libfqfft/kronecker_substitution/kronecker_substitution.tcc>
3030

3131
#endif // KRONECKER_SUBSTITUTION_HPP_

src/polynomial_arithmetic/basic_operations.hpp renamed to libfqfft/polynomial_arithmetic/basic_operations.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,6 @@ void _polynomial_division(std::vector<FieldT> &q, std::vector<FieldT> &r, const
8585

8686
} // libfqfft
8787

88-
#include "basic_operations.tcc"
88+
#include <libfqfft/polynomial_arithmetic/basic_operations.tcc>
8989

9090
#endif // BASIC_OPERATIONS_HPP_

src/polynomial_arithmetic/basic_operations.tcc renamed to libfqfft/polynomial_arithmetic/basic_operations.tcc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616

1717
#include <algorithm>
1818

19-
#include "../evaluation_domain/domains/basic_radix2_domain_aux.hpp"
20-
#include "../kronecker_substitution/kronecker_substitution.hpp"
21-
#include "../tools/exceptions.hpp"
19+
#include <libfqfft/evaluation_domain/domains/basic_radix2_domain_aux.hpp>
20+
#include <libfqfft/kronecker_substitution/kronecker_substitution.hpp>
21+
#include <libfqfft/tools/exceptions.hpp>
2222

2323
#ifdef MULTICORE
2424
#include <omp.h>

src/polynomial_arithmetic/basis_change.hpp renamed to libfqfft/polynomial_arithmetic/basis_change.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,6 @@ void newton_to_monomial_basis_geometric(std::vector<FieldT> &a,
6262

6363
} // libfqfft
6464

65-
#include "basis_change.tcc"
65+
#include <libfqfft/polynomial_arithmetic/basis_change.tcc>
6666

6767
#endif // BASIS_CHANGE_HPP_

src/polynomial_arithmetic/basis_change.tcc renamed to libfqfft/polynomial_arithmetic/basis_change.tcc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
#define BASIS_CHANGE_TCC_
1616

1717
#include <algorithm>
18-
#include "basic_operations.hpp"
19-
#include "xgcd.hpp"
20-
#include "../evaluation_domain/domains/basic_radix2_domain_aux.hpp"
18+
#include <libfqfft/polynomial_arithmetic/basic_operations.hpp>
19+
#include <libfqfft/polynomial_arithmetic/xgcd.hpp>
20+
#include <libfqfft/evaluation_domain/domains/basic_radix2_domain_aux.hpp>
2121

2222
namespace libfqfft {
2323

src/polynomial_arithmetic/naive_evaluate.hpp renamed to libfqfft/polynomial_arithmetic/naive_evaluate.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,6 @@ FieldT evaluate_lagrange_polynomial(const size_t &m, const std::vector<FieldT> &
4141

4242
} // libfqfft
4343

44-
#include "naive_evaluate.tcc"
44+
#include <libfqfft/polynomial_arithmetic/naive_evaluate.tcc>
4545

4646
#endif // NAIVE_EVALUATE_HPP_

src/polynomial_arithmetic/xgcd.hpp renamed to libfqfft/polynomial_arithmetic/xgcd.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ void _polynomial_xgcd(const std::vector<FieldT> &a, const std::vector<FieldT> &b
2424

2525
} // libfqfft
2626

27-
#include "xgcd.tcc"
27+
#include <libfqfft/polynomial_arithmetic/xgcd.tcc>
2828

2929
#endif // XGCD_HPP_

src/polynomial_arithmetic/xgcd.tcc renamed to libfqfft/polynomial_arithmetic/xgcd.tcc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
#define XGCD_TCC_
1616

1717
#include <algorithm>
18-
#include "basic_operations.hpp"
19-
#include "../evaluation_domain/domains/basic_radix2_domain_aux.hpp"
18+
#include <libfqfft/polynomial_arithmetic/basic_operations.hpp>
19+
#include <libfqfft/evaluation_domain/domains/basic_radix2_domain_aux.hpp>
2020

2121
namespace libfqfft {
2222

0 commit comments

Comments
 (0)