From af199b440e2a877013f5f2ff53fc6c31f8e90b00 Mon Sep 17 00:00:00 2001 From: Mayeul d'Avezac <2745737+mdavezac@users.noreply.github.com> Date: Fri, 16 Oct 2020 22:05:34 +0100 Subject: [PATCH] Move headers to include/s2let --- MANIFEST.in | 2 +- conanfile.py | 7 ++++--- include/{ => s2let}/s2let.h | 0 include/{ => s2let}/s2let_alloc.h | 0 include/{ => s2let}/s2let_analysis.h | 0 include/{ => s2let}/s2let_analysis_adjoint.h | 0 include/{ => s2let}/s2let_axisym_denoising_demo.h | 0 include/{ => s2let}/s2let_denoising_demo.h | 0 include/{ => s2let}/s2let_error.h | 0 include/{ => s2let}/s2let_fits.h | 0 include/{ => s2let}/s2let_helper.h | 0 include/{ => s2let}/s2let_hpx.h | 0 include/{ => s2let}/s2let_idl_hpx.h | 0 include/{ => s2let}/s2let_idl_mw.h | 0 include/{ => s2let}/s2let_lm.h | 0 include/{ => s2let}/s2let_math.h | 0 include/{ => s2let}/s2let_mex.h | 0 include/{ => s2let}/s2let_mw.h | 0 include/{ => s2let}/s2let_so3.h | 0 include/{ => s2let}/s2let_synthesis.h | 0 include/{ => s2let}/s2let_synthesis_adjoint.h | 0 include/{ => s2let}/s2let_tiling.h | 0 include/{ => s2let}/s2let_transform_axisym_hpx.h | 0 include/{ => s2let}/s2let_transform_axisym_lm.h | 0 include/{ => s2let}/s2let_transform_axisym_mw.h | 0 include/{ => s2let}/s2let_types.h | 0 src/main/c/CMakeLists.txt | 12 +++--------- src/main/c/s2let_alloc.c | 2 +- src/main/c/s2let_analysis.c | 2 +- src/main/c/s2let_analysis_adjoint.c | 2 +- src/main/c/s2let_axisym_denoising_demo.c | 2 +- src/main/c/s2let_denoising_demo.c | 2 +- src/main/c/s2let_fits.c | 2 +- src/main/c/s2let_helper.c | 2 +- src/main/c/s2let_hpx.c | 2 +- src/main/c/s2let_hpx_demo.c | 2 +- src/main/c/s2let_idl_hpx.c | 2 +- src/main/c/s2let_idl_mw.c | 2 +- src/main/c/s2let_lm.c | 2 +- src/main/c/s2let_math.c | 2 +- src/main/c/s2let_mw.c | 2 +- src/main/c/s2let_spin_denoising_demo.c | 2 +- src/main/c/s2let_synthesis.c | 2 +- src/main/c/s2let_synthesis_adjoint.c | 2 +- src/main/c/s2let_tiling.c | 2 +- .../c/s2let_transform_axisym_analysis_hpx_real.c | 2 +- src/main/c/s2let_transform_axisym_analysis_mw_real.c | 2 +- src/main/c/s2let_transform_axisym_hpx.c | 2 +- src/main/c/s2let_transform_axisym_lm.c | 2 +- src/main/c/s2let_transform_axisym_mw.c | 2 +- .../c/s2let_transform_axisym_synthesis_hpx_real.c | 2 +- .../c/s2let_transform_axisym_synthesis_mw_real.c | 2 +- src/test/c/test_adjoint.c | 2 +- src/test/c/test_axisym_vs_directional.c | 2 +- src/test/c/test_back_and_forth.c | 2 +- src/test/c/test_tiling.c | 2 +- 56 files changed, 37 insertions(+), 42 deletions(-) rename include/{ => s2let}/s2let.h (100%) rename include/{ => s2let}/s2let_alloc.h (100%) rename include/{ => s2let}/s2let_analysis.h (100%) rename include/{ => s2let}/s2let_analysis_adjoint.h (100%) rename include/{ => s2let}/s2let_axisym_denoising_demo.h (100%) rename include/{ => s2let}/s2let_denoising_demo.h (100%) rename include/{ => s2let}/s2let_error.h (100%) rename include/{ => s2let}/s2let_fits.h (100%) rename include/{ => s2let}/s2let_helper.h (100%) rename include/{ => s2let}/s2let_hpx.h (100%) rename include/{ => s2let}/s2let_idl_hpx.h (100%) rename include/{ => s2let}/s2let_idl_mw.h (100%) rename include/{ => s2let}/s2let_lm.h (100%) rename include/{ => s2let}/s2let_math.h (100%) rename include/{ => s2let}/s2let_mex.h (100%) rename include/{ => s2let}/s2let_mw.h (100%) rename include/{ => s2let}/s2let_so3.h (100%) rename include/{ => s2let}/s2let_synthesis.h (100%) rename include/{ => s2let}/s2let_synthesis_adjoint.h (100%) rename include/{ => s2let}/s2let_tiling.h (100%) rename include/{ => s2let}/s2let_transform_axisym_hpx.h (100%) rename include/{ => s2let}/s2let_transform_axisym_lm.h (100%) rename include/{ => s2let}/s2let_transform_axisym_mw.h (100%) rename include/{ => s2let}/s2let_types.h (100%) diff --git a/MANIFEST.in b/MANIFEST.in index 9fa8bdff..e4c476ed 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -3,5 +3,5 @@ include setup.py setup.cfg pyproject.toml include COPYRIGHT.txt LICENSE.md README.md include cmake/*.cmake recursive-include src/main/c *.c CMakeLists.txt -recursive-include include *.h +recursive-include include/s2let *.h recursive-include src/main/pys2let .py *.pyx *.md CMakeLists.txt diff --git a/conanfile.py b/conanfile.py index 7a63e349..69f6396f 100644 --- a/conanfile.py +++ b/conanfile.py @@ -1,4 +1,4 @@ -from conans import ConanFile, CMake +from conans import CMake, ConanFile class S2letConan(ConanFile): @@ -16,7 +16,7 @@ class S2letConan(ConanFile): exports_sources = [ "src/main/c/*", "src/test/c/*", - "include/*", + "include/s2let/*", "CMakeLists.txt", "cmake/*.cmake", ] @@ -31,7 +31,8 @@ def configure(self): del self.settings.compiler.libcxx def requirements(self): - self.requires("so3/1.3.0@astro-informatics/stable") + location = "astro-informatics/stable" if self.in_local_cache else "user/testing" + self.requires(f"so3/1.3.0@{location}") if self.options.with_cfitsio: self.requires("cfitsio/3.480") diff --git a/include/s2let.h b/include/s2let/s2let.h similarity index 100% rename from include/s2let.h rename to include/s2let/s2let.h diff --git a/include/s2let_alloc.h b/include/s2let/s2let_alloc.h similarity index 100% rename from include/s2let_alloc.h rename to include/s2let/s2let_alloc.h diff --git a/include/s2let_analysis.h b/include/s2let/s2let_analysis.h similarity index 100% rename from include/s2let_analysis.h rename to include/s2let/s2let_analysis.h diff --git a/include/s2let_analysis_adjoint.h b/include/s2let/s2let_analysis_adjoint.h similarity index 100% rename from include/s2let_analysis_adjoint.h rename to include/s2let/s2let_analysis_adjoint.h diff --git a/include/s2let_axisym_denoising_demo.h b/include/s2let/s2let_axisym_denoising_demo.h similarity index 100% rename from include/s2let_axisym_denoising_demo.h rename to include/s2let/s2let_axisym_denoising_demo.h diff --git a/include/s2let_denoising_demo.h b/include/s2let/s2let_denoising_demo.h similarity index 100% rename from include/s2let_denoising_demo.h rename to include/s2let/s2let_denoising_demo.h diff --git a/include/s2let_error.h b/include/s2let/s2let_error.h similarity index 100% rename from include/s2let_error.h rename to include/s2let/s2let_error.h diff --git a/include/s2let_fits.h b/include/s2let/s2let_fits.h similarity index 100% rename from include/s2let_fits.h rename to include/s2let/s2let_fits.h diff --git a/include/s2let_helper.h b/include/s2let/s2let_helper.h similarity index 100% rename from include/s2let_helper.h rename to include/s2let/s2let_helper.h diff --git a/include/s2let_hpx.h b/include/s2let/s2let_hpx.h similarity index 100% rename from include/s2let_hpx.h rename to include/s2let/s2let_hpx.h diff --git a/include/s2let_idl_hpx.h b/include/s2let/s2let_idl_hpx.h similarity index 100% rename from include/s2let_idl_hpx.h rename to include/s2let/s2let_idl_hpx.h diff --git a/include/s2let_idl_mw.h b/include/s2let/s2let_idl_mw.h similarity index 100% rename from include/s2let_idl_mw.h rename to include/s2let/s2let_idl_mw.h diff --git a/include/s2let_lm.h b/include/s2let/s2let_lm.h similarity index 100% rename from include/s2let_lm.h rename to include/s2let/s2let_lm.h diff --git a/include/s2let_math.h b/include/s2let/s2let_math.h similarity index 100% rename from include/s2let_math.h rename to include/s2let/s2let_math.h diff --git a/include/s2let_mex.h b/include/s2let/s2let_mex.h similarity index 100% rename from include/s2let_mex.h rename to include/s2let/s2let_mex.h diff --git a/include/s2let_mw.h b/include/s2let/s2let_mw.h similarity index 100% rename from include/s2let_mw.h rename to include/s2let/s2let_mw.h diff --git a/include/s2let_so3.h b/include/s2let/s2let_so3.h similarity index 100% rename from include/s2let_so3.h rename to include/s2let/s2let_so3.h diff --git a/include/s2let_synthesis.h b/include/s2let/s2let_synthesis.h similarity index 100% rename from include/s2let_synthesis.h rename to include/s2let/s2let_synthesis.h diff --git a/include/s2let_synthesis_adjoint.h b/include/s2let/s2let_synthesis_adjoint.h similarity index 100% rename from include/s2let_synthesis_adjoint.h rename to include/s2let/s2let_synthesis_adjoint.h diff --git a/include/s2let_tiling.h b/include/s2let/s2let_tiling.h similarity index 100% rename from include/s2let_tiling.h rename to include/s2let/s2let_tiling.h diff --git a/include/s2let_transform_axisym_hpx.h b/include/s2let/s2let_transform_axisym_hpx.h similarity index 100% rename from include/s2let_transform_axisym_hpx.h rename to include/s2let/s2let_transform_axisym_hpx.h diff --git a/include/s2let_transform_axisym_lm.h b/include/s2let/s2let_transform_axisym_lm.h similarity index 100% rename from include/s2let_transform_axisym_lm.h rename to include/s2let/s2let_transform_axisym_lm.h diff --git a/include/s2let_transform_axisym_mw.h b/include/s2let/s2let_transform_axisym_mw.h similarity index 100% rename from include/s2let_transform_axisym_mw.h rename to include/s2let/s2let_transform_axisym_mw.h diff --git a/include/s2let_types.h b/include/s2let/s2let_types.h similarity index 100% rename from include/s2let_types.h rename to include/s2let/s2let_types.h diff --git a/src/main/c/CMakeLists.txt b/src/main/c/CMakeLists.txt index 51410f9e..f331433f 100644 --- a/src/main/c/CMakeLists.txt +++ b/src/main/c/CMakeLists.txt @@ -11,7 +11,6 @@ set(C_SRC s2let_helper.c s2let_analysis.c s2let_analysis_adjoint.c) -set(HEADER_PREFIX ${PROJECT_SOURCE_DIR}/include) set(C_HEADERS s2let.h s2let_error.h @@ -39,11 +38,12 @@ set(C_HEADERS if(cfitsio) list(APPEND C_SRC s2let_fits.c) endif() -list(TRANSFORM C_HEADERS PREPEND "${PROJECT_SOURCE_DIR}/include/") +list(TRANSFORM C_HEADERS PREPEND "${PROJECT_SOURCE_DIR}/include/s2let") add_library(s2let STATIC ${C_SRC}) target_link_libraries(s2let PUBLIC ${SO3_TARGET} ${CFITSIO_TARGET}) -set_target_properties(s2let PROPERTIES C_STANDARD 99) +set_target_properties(s2let PROPERTIES C_STANDARD 99 ARCHIVE_OUTPUT_DIRECTORY + ${PROJECT_BINARY_DIR}/lib) target_include_directories( s2let PUBLIC $ $) @@ -52,12 +52,6 @@ if(fPIC) endif() if(NOT python) - add_executable(s2let_about s2let_about.c) - target_compile_definitions( - s2let_about PRIVATE S2LET_VERSION="${PROJECT_VERSION}" S2LET_BUILD="CMake") - set_target_properties(s2let_about PROPERTIES RUNTIME_OUTPUT_DIRECTORY - ${PROJECT_BINARY_DIR}) - install( TARGETS s2let EXPORT S2letTargets diff --git a/src/main/c/s2let_alloc.c b/src/main/c/s2let_alloc.c index ea0a9319..82a65536 100644 --- a/src/main/c/s2let_alloc.c +++ b/src/main/c/s2let_alloc.c @@ -9,7 +9,7 @@ #include #include -#include "s2let.h" +#include "s2let/s2let.h" /*! * Allocate map for a complex signal in pixel space using MW sampling. diff --git a/src/main/c/s2let_analysis.c b/src/main/c/s2let_analysis.c index 1f6e9970..d7986535 100644 --- a/src/main/c/s2let_analysis.c +++ b/src/main/c/s2let_analysis.c @@ -9,7 +9,7 @@ #include #include -#include "s2let.h" +#include "s2let/s2let.h" /*! * Wavelet analysis from harmonic space to Wigner space for complex signals. diff --git a/src/main/c/s2let_analysis_adjoint.c b/src/main/c/s2let_analysis_adjoint.c index 4540cf6f..8e839ef1 100644 --- a/src/main/c/s2let_analysis_adjoint.c +++ b/src/main/c/s2let_analysis_adjoint.c @@ -9,7 +9,7 @@ #include #include -#include "s2let.h" +#include "s2let/s2let.h" /*! * Wavelet analysis adjoint from Wigner space to harmonic space for complex signals. diff --git a/src/main/c/s2let_axisym_denoising_demo.c b/src/main/c/s2let_axisym_denoising_demo.c index 1c6ed8c9..b7499e1f 100644 --- a/src/main/c/s2let_axisym_denoising_demo.c +++ b/src/main/c/s2let_axisym_denoising_demo.c @@ -11,7 +11,7 @@ #include #include -#include "s2let.h" +#include "s2let/s2let.h" void s2let_lm_random_flm_real_sigma( complex double *flm, int L, int seed, double sigmanoise) { diff --git a/src/main/c/s2let_denoising_demo.c b/src/main/c/s2let_denoising_demo.c index e152e13a..fa4df6b8 100644 --- a/src/main/c/s2let_denoising_demo.c +++ b/src/main/c/s2let_denoising_demo.c @@ -11,7 +11,7 @@ #include #include -#include "s2let.h" +#include "s2let/s2let.h" void s2let_lm_random_flm_real_sigma( complex double *flm, int L, int seed, double sigmanoise) { diff --git a/src/main/c/s2let_fits.c b/src/main/c/s2let_fits.c index cc66ede1..17fe892b 100644 --- a/src/main/c/s2let_fits.c +++ b/src/main/c/s2let_fits.c @@ -4,7 +4,7 @@ #include -#include "s2let.h" +#include "s2let/s2let.h" void printerror(int status) { if (status) { diff --git a/src/main/c/s2let_helper.c b/src/main/c/s2let_helper.c index 2bb7dcca..97c53eda 100644 --- a/src/main/c/s2let_helper.c +++ b/src/main/c/s2let_helper.c @@ -1,6 +1,6 @@ #include -#include "s2let.h" +#include "s2let/s2let.h" int s2let_n_phi(const s2let_parameters_t *parameters) { if (parameters->sampling_scheme == S2LET_SAMPLING_MW_SS) diff --git a/src/main/c/s2let_hpx.c b/src/main/c/s2let_hpx.c index 57ab98b9..7c966e9d 100644 --- a/src/main/c/s2let_hpx.c +++ b/src/main/c/s2let_hpx.c @@ -6,7 +6,7 @@ #include #include -#include "s2let.h" +#include "s2let/s2let.h" // Fortran interfaces to Healpix F90 library ; see s2let_hpx.f90 extern void healpix_inverse_real_(); diff --git a/src/main/c/s2let_hpx_demo.c b/src/main/c/s2let_hpx_demo.c index 80ff1a16..d945fcaa 100644 --- a/src/main/c/s2let_hpx_demo.c +++ b/src/main/c/s2let_hpx_demo.c @@ -11,7 +11,7 @@ #include #include -#include "s2let.h" +#include "s2let/s2let.h" /*! * PROGRAM : s2let_hpx_demo diff --git a/src/main/c/s2let_idl_hpx.c b/src/main/c/s2let_idl_hpx.c index df4e8db4..b2592b15 100644 --- a/src/main/c/s2let_idl_hpx.c +++ b/src/main/c/s2let_idl_hpx.c @@ -2,7 +2,7 @@ // Copyright (C) 2012 // Boris Leistedt & Jason McEwen -#include "s2let.h" +#include "s2let/s2let.h" /* * IDL integer types. For historical reasons, we use UCHAR for TYP_BYTE diff --git a/src/main/c/s2let_idl_mw.c b/src/main/c/s2let_idl_mw.c index 55f25b1b..100f2367 100644 --- a/src/main/c/s2let_idl_mw.c +++ b/src/main/c/s2let_idl_mw.c @@ -2,7 +2,7 @@ // Copyright (C) 2012 // Boris Leistedt & Jason McEwen -#include "s2let.h" +#include "s2let/s2let.h" /* * IDL integer types. For historical reasons, we use UCHAR for TYP_BYTE diff --git a/src/main/c/s2let_lm.c b/src/main/c/s2let_lm.c index b89bb5fb..b6968c94 100644 --- a/src/main/c/s2let_lm.c +++ b/src/main/c/s2let_lm.c @@ -9,7 +9,7 @@ #include #include -#include "s2let.h" +#include "s2let/s2let.h" /*! * Compute power for a signal in harmonic space. diff --git a/src/main/c/s2let_math.c b/src/main/c/s2let_math.c index 84c7d784..338ad980 100644 --- a/src/main/c/s2let_math.c +++ b/src/main/c/s2let_math.c @@ -7,7 +7,7 @@ #include #include -#include "s2let.h" +#include "s2let/s2let.h" /*! * Tiling function for S2DW wavelets diff --git a/src/main/c/s2let_mw.c b/src/main/c/s2let_mw.c index 12968c4d..c0c1f956 100644 --- a/src/main/c/s2let_mw.c +++ b/src/main/c/s2let_mw.c @@ -7,7 +7,7 @@ #include #include -#include "s2let.h" +#include "s2let/s2let.h" /*! * Interface to SSHT (required by the Java interface to S2LET) diff --git a/src/main/c/s2let_spin_denoising_demo.c b/src/main/c/s2let_spin_denoising_demo.c index 293c5359..98a5e34f 100644 --- a/src/main/c/s2let_spin_denoising_demo.c +++ b/src/main/c/s2let_spin_denoising_demo.c @@ -10,7 +10,7 @@ #include #include -#include "s2let.h" +#include "s2let/s2let.h" void s2let_lm_random_flm_sigma( complex double *flm, int L, int spin, int seed, double sigmanoise) { diff --git a/src/main/c/s2let_synthesis.c b/src/main/c/s2let_synthesis.c index 9ba8dcaa..d22ed159 100644 --- a/src/main/c/s2let_synthesis.c +++ b/src/main/c/s2let_synthesis.c @@ -9,7 +9,7 @@ #include #include -#include "s2let.h" +#include "s2let/s2let.h" /*! * Wavelet synthesis from Wigner space to harmonic space for complex signals. diff --git a/src/main/c/s2let_synthesis_adjoint.c b/src/main/c/s2let_synthesis_adjoint.c index 2b727c85..d23b28bd 100644 --- a/src/main/c/s2let_synthesis_adjoint.c +++ b/src/main/c/s2let_synthesis_adjoint.c @@ -9,7 +9,7 @@ #include #include -#include "s2let.h" +#include "s2let/s2let.h" /*! * Wavelet synthesis adjoint from harmonic space to Wigner space for complex signals. diff --git a/src/main/c/s2let_tiling.c b/src/main/c/s2let_tiling.c index 31b589e4..3939f130 100644 --- a/src/main/c/s2let_tiling.c +++ b/src/main/c/s2let_tiling.c @@ -6,7 +6,7 @@ #include #include -#include "s2let.h" +#include "s2let/s2let.h" // // diff --git a/src/main/c/s2let_transform_axisym_analysis_hpx_real.c b/src/main/c/s2let_transform_axisym_analysis_hpx_real.c index 7ef0f177..88977067 100644 --- a/src/main/c/s2let_transform_axisym_analysis_hpx_real.c +++ b/src/main/c/s2let_transform_axisym_analysis_hpx_real.c @@ -10,7 +10,7 @@ #include #include -#include "s2let.h" +#include "s2let/s2let.h" /*! * PROGRAM : s2let_transform_axisym_hpx_analysis_real diff --git a/src/main/c/s2let_transform_axisym_analysis_mw_real.c b/src/main/c/s2let_transform_axisym_analysis_mw_real.c index bfd08fdd..6fc6f2ca 100644 --- a/src/main/c/s2let_transform_axisym_analysis_mw_real.c +++ b/src/main/c/s2let_transform_axisym_analysis_mw_real.c @@ -10,7 +10,7 @@ #include #include -#include "s2let.h" +#include "s2let/s2let.h" /*! * PROGRAM : s2let_transform_axisym_mw_analysis_real diff --git a/src/main/c/s2let_transform_axisym_hpx.c b/src/main/c/s2let_transform_axisym_hpx.c index f58d91c2..5e0482f6 100644 --- a/src/main/c/s2let_transform_axisym_hpx.c +++ b/src/main/c/s2let_transform_axisym_hpx.c @@ -5,7 +5,7 @@ #include #include -#include "s2let.h" +#include "s2let/s2let.h" void s2let_transform_axisym_allocate_hpx_f_wav_real( double **f_wav, double **f_scal, int nside, const s2let_parameters_t *parameters) { diff --git a/src/main/c/s2let_transform_axisym_lm.c b/src/main/c/s2let_transform_axisym_lm.c index 69067e8d..69e97229 100644 --- a/src/main/c/s2let_transform_axisym_lm.c +++ b/src/main/c/s2let_transform_axisym_lm.c @@ -6,7 +6,7 @@ #include #include -#include "s2let.h" +#include "s2let/s2let.h" static inline int lm2ind(int el, int m) { return el * el + el + m; } diff --git a/src/main/c/s2let_transform_axisym_mw.c b/src/main/c/s2let_transform_axisym_mw.c index f3f8d701..50cd42b9 100644 --- a/src/main/c/s2let_transform_axisym_mw.c +++ b/src/main/c/s2let_transform_axisym_mw.c @@ -7,7 +7,7 @@ #include #include -#include "s2let.h" +#include "s2let/s2let.h" /*! * Allocates arrays for final wavelets and scaling functions in pixel space (MW diff --git a/src/main/c/s2let_transform_axisym_synthesis_hpx_real.c b/src/main/c/s2let_transform_axisym_synthesis_hpx_real.c index 90186d42..b17b151c 100644 --- a/src/main/c/s2let_transform_axisym_synthesis_hpx_real.c +++ b/src/main/c/s2let_transform_axisym_synthesis_hpx_real.c @@ -10,7 +10,7 @@ #include #include -#include "s2let.h" +#include "s2let/s2let.h" /*! * PROGRAM : s2let_transform_axisym_hpx_synthesis_real diff --git a/src/main/c/s2let_transform_axisym_synthesis_mw_real.c b/src/main/c/s2let_transform_axisym_synthesis_mw_real.c index 48555b31..50279496 100644 --- a/src/main/c/s2let_transform_axisym_synthesis_mw_real.c +++ b/src/main/c/s2let_transform_axisym_synthesis_mw_real.c @@ -10,7 +10,7 @@ #include #include -#include "s2let.h" +#include "s2let/s2let.h" /*! * PROGRAM : s2let_transform_axisym_mw_synthesis_real diff --git a/src/test/c/test_adjoint.c b/src/test/c/test_adjoint.c index 0fb08a42..50746798 100644 --- a/src/test/c/test_adjoint.c +++ b/src/test/c/test_adjoint.c @@ -2,7 +2,7 @@ #include #include -#include "s2let.h" +#include "s2let/s2let.h" #include diff --git a/src/test/c/test_axisym_vs_directional.c b/src/test/c/test_axisym_vs_directional.c index 9096d37c..7525c6e2 100644 --- a/src/test/c/test_axisym_vs_directional.c +++ b/src/test/c/test_axisym_vs_directional.c @@ -2,7 +2,7 @@ #include #include -#include "s2let.h" +#include "s2let/s2let.h" #include diff --git a/src/test/c/test_back_and_forth.c b/src/test/c/test_back_and_forth.c index 849494d9..aae669fa 100644 --- a/src/test/c/test_back_and_forth.c +++ b/src/test/c/test_back_and_forth.c @@ -2,7 +2,7 @@ #include #include -#include "s2let.h" +#include "s2let/s2let.h" #include diff --git a/src/test/c/test_tiling.c b/src/test/c/test_tiling.c index 95b65ed8..c894e689 100644 --- a/src/test/c/test_tiling.c +++ b/src/test/c/test_tiling.c @@ -2,7 +2,7 @@ #include #include -#include "s2let.h" +#include "s2let/s2let.h" #include