Move headers to include/s2let

astro-informatics · Oct 16, 2020 · af199b4 · af199b4
1 parent cd6b48c
commit af199b4
Show file tree

Hide file tree

Showing 56 changed files with 37 additions and 42 deletions.
diff --git 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
@@ -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 → include/s2let/s2let.h b/include/s2let.h → include/s2let/s2let.h
diff --git a/include/s2let_alloc.h → include/s2let/s2let_alloc.h b/include/s2let_alloc.h → include/s2let/s2let_alloc.h
diff --git a/include/s2let_analysis.h → include/s2let/s2let_analysis.h b/include/s2let_analysis.h → include/s2let/s2let_analysis.h
diff --git a/include/s2let_analysis_adjoint.h → include/s2let/s2let_analysis_adjoint.h b/include/s2let_analysis_adjoint.h → include/s2let/s2let_analysis_adjoint.h
diff --git a/include/s2let_axisym_denoising_demo.h → include/s2let/s2let_axisym_denoising_demo.h b/include/s2let_axisym_denoising_demo.h → include/s2let/s2let_axisym_denoising_demo.h
diff --git a/include/s2let_denoising_demo.h → include/s2let/s2let_denoising_demo.h b/include/s2let_denoising_demo.h → include/s2let/s2let_denoising_demo.h
diff --git a/include/s2let_error.h → include/s2let/s2let_error.h b/include/s2let_error.h → include/s2let/s2let_error.h
diff --git a/include/s2let_fits.h → include/s2let/s2let_fits.h b/include/s2let_fits.h → include/s2let/s2let_fits.h
diff --git a/include/s2let_helper.h → include/s2let/s2let_helper.h b/include/s2let_helper.h → include/s2let/s2let_helper.h
diff --git a/include/s2let_hpx.h → include/s2let/s2let_hpx.h b/include/s2let_hpx.h → include/s2let/s2let_hpx.h
diff --git a/include/s2let_idl_hpx.h → include/s2let/s2let_idl_hpx.h b/include/s2let_idl_hpx.h → include/s2let/s2let_idl_hpx.h
diff --git a/include/s2let_idl_mw.h → include/s2let/s2let_idl_mw.h b/include/s2let_idl_mw.h → include/s2let/s2let_idl_mw.h
diff --git a/include/s2let_lm.h → include/s2let/s2let_lm.h b/include/s2let_lm.h → include/s2let/s2let_lm.h
diff --git a/include/s2let_math.h → include/s2let/s2let_math.h b/include/s2let_math.h → include/s2let/s2let_math.h
diff --git a/include/s2let_mex.h → include/s2let/s2let_mex.h b/include/s2let_mex.h → include/s2let/s2let_mex.h
diff --git a/include/s2let_mw.h → include/s2let/s2let_mw.h b/include/s2let_mw.h → include/s2let/s2let_mw.h
diff --git a/include/s2let_so3.h → include/s2let/s2let_so3.h b/include/s2let_so3.h → include/s2let/s2let_so3.h
diff --git a/include/s2let_synthesis.h → include/s2let/s2let_synthesis.h b/include/s2let_synthesis.h → include/s2let/s2let_synthesis.h
diff --git a/include/s2let_synthesis_adjoint.h → include/s2let/s2let_synthesis_adjoint.h b/include/s2let_synthesis_adjoint.h → include/s2let/s2let_synthesis_adjoint.h
diff --git a/include/s2let_tiling.h → include/s2let/s2let_tiling.h b/include/s2let_tiling.h → include/s2let/s2let_tiling.h
diff --git a/include/s2let_transform_axisym_hpx.h → include/s2let/s2let_transform_axisym_hpx.h b/include/s2let_transform_axisym_hpx.h → include/s2let/s2let_transform_axisym_hpx.h
diff --git a/include/s2let_transform_axisym_lm.h → include/s2let/s2let_transform_axisym_lm.h b/include/s2let_transform_axisym_lm.h → include/s2let/s2let_transform_axisym_lm.h
diff --git a/include/s2let_transform_axisym_mw.h → include/s2let/s2let_transform_axisym_mw.h b/include/s2let_transform_axisym_mw.h → include/s2let/s2let_transform_axisym_mw.h
diff --git a/include/s2let_types.h → include/s2let/s2let_types.h b/include/s2let_types.h → include/s2let/s2let_types.h
diff --git 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 $<INSTALL_INTERFACE:include>
                $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>)
@@ -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
@@ -9,7 +9,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#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
@@ -9,7 +9,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#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
@@ -9,7 +9,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#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
@@ -11,7 +11,7 @@
 #include <string.h>
 #include <time.h>
 
-#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
@@ -11,7 +11,7 @@
 #include <string.h>
 #include <time.h>
 
-#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
@@ -4,7 +4,7 @@
 
 #include <fitsio.h>
 
-#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
@@ -1,6 +1,6 @@
 #include <ssht/ssht.h>
 
-#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
@@ -6,7 +6,7 @@
 #include <ssht/ssht.h>
 #include <stdlib.h>
 
-#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
@@ -11,7 +11,7 @@
 #include <string.h>
 #include <time.h>
 
-#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
@@ -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
@@ -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
@@ -9,7 +9,7 @@
 #include <stdlib.h>
 #include <time.h>
 
-#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
@@ -7,7 +7,7 @@
 #include <stdlib.h>
 #include <time.h>
 
-#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
@@ -7,7 +7,7 @@
 #include <ssht/ssht.h>
 #include <stdlib.h>
 
-#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
@@ -10,7 +10,7 @@
 #include <string.h>
 #include <time.h>
 
-#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
@@ -9,7 +9,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#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
@@ -9,7 +9,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#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
@@ -6,7 +6,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#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
@@ -10,7 +10,7 @@
 #include <string.h>
 #include <time.h>
 
-#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
@@ -10,7 +10,7 @@
 #include <string.h>
 #include <time.h>
 
-#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
@@ -5,7 +5,7 @@
 #include <complex.h>
 #include <stdlib.h>
 
-#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
@@ -6,7 +6,7 @@
 #include <math.h>
 #include <stdlib.h>
 
-#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
@@ -7,7 +7,7 @@
 #include <ssht/ssht.h>
 #include <stdlib.h>
 
-#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
@@ -10,7 +10,7 @@
 #include <string.h>
 #include <time.h>
 
-#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
@@ -10,7 +10,7 @@
 #include <string.h>
 #include <time.h>
 
-#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
@@ -2,7 +2,7 @@
 #include <stdarg.h>
 #include <stddef.h>
 
-#include "s2let.h"
+#include "s2let/s2let.h"
 
 #include <cmocka.h>
 

diff --git a/src/test/c/test_axisym_vs_directional.c b/src/test/c/test_axisym_vs_directional.c
@@ -2,7 +2,7 @@
 #include <stdarg.h>
 #include <stddef.h>
 
-#include "s2let.h"
+#include "s2let/s2let.h"
 
 #include <cmocka.h>
 

diff --git a/src/test/c/test_back_and_forth.c b/src/test/c/test_back_and_forth.c
@@ -2,7 +2,7 @@
 #include <stdarg.h>
 #include <stddef.h>
 
-#include "s2let.h"
+#include "s2let/s2let.h"
 
 #include <cmocka.h>
 

diff --git a/src/test/c/test_tiling.c b/src/test/c/test_tiling.c
@@ -2,7 +2,7 @@
 #include <stdarg.h>
 #include <stddef.h>
 
-#include "s2let.h"
+#include "s2let/s2let.h"
 
 #include <cmocka.h>