Merge https://github.com/isce-framework/isce2 into py_save

2021-02-13 12:42:05 -08:00 · 2021-02-13 12:42:05 -08:00 · 08c266e364
parent 4ddee2fdaf 4f0ed3a359
commit 08c266e364
15 changed files with 175 additions and 4 deletions
--- a/components/isceobj/Sensor/db/CMakeLists.txt
+++ b/components/isceobj/Sensor/db/CMakeLists.txt
@ -1 +1,10 @@
 add_subdirectory(alos)
+add_subdirectory(alos2_slc)
+add_subdirectory(alos_slc)
+add_subdirectory(ers)
+add_subdirectory(ers_slc)
+add_subdirectory(jers)
+add_subdirectory(radarsat)
+add_subdirectory(radarsat_slc)
+add_subdirectory(risat)
+add_subdirectory(risat_slc)
--- a/components/isceobj/Sensor/db/alos2_slc/CMakeLists.txt
+++ b/components/isceobj/Sensor/db/alos2_slc/CMakeLists.txt
@ -0,0 +1,19 @@
+InstallSameDir(
+    attitude_record.xml
+    data_histogram_record.xml
+    data_quality_summary_record.xml
+    detailed_processing_record.xml
+    facility_record.xml
+    file_pointer_record.xml
+    image_file.xml
+    image_record.xml
+    leader_file.xml
+    map_proj_record.xml
+    platform_position_record.xml
+    radiometric_compensation_record.xml
+    radiometric_record.xml
+    scene_record.xml
+    text_record.xml
+    trailer_file.xml
+    volume_descriptor.xml
+    )
--- a/components/isceobj/Sensor/db/alos_slc/CMakeLists.txt
+++ b/components/isceobj/Sensor/db/alos_slc/CMakeLists.txt
@ -0,0 +1,18 @@
+InstallSameDir(
+    attitude_record.xml
+    data_histogram_record.xml
+    data_quality_summary_record.xml
+    detailed_processing_record.xml
+    file_pointer_record.xml
+    image_file.xml
+    image_record.xml
+    leader_file.xml
+    map_proj_record.xml
+    platform_position_record.xml
+    radiometric_compensation_record.xml
+    radiometric_record.xml
+    scene_record.xml
+    text_record.xml
+    trailer_file.xml
+    volume_descriptor.xml
+    )
--- a/components/isceobj/Sensor/db/ers/CMakeLists.txt
+++ b/components/isceobj/Sensor/db/ers/CMakeLists.txt
@ -0,0 +1,15 @@
+InstallSameDir(
+    crdc-sardpf_image_record.xml
+    facility_record.xml
+    facility_related_pcs_record.xml
+    file_pointer_record.xml
+    image_file.xml
+    image_record.xml
+    leader_file.xml
+    map_proj_record.xml
+    new-d-paf_image_record.xml
+    platform_position_record.xml
+    scene_record.xml
+    text_record.xml
+    volume_descriptor.xml
+    )
--- a/components/isceobj/Sensor/db/ers_slc/CMakeLists.txt
+++ b/components/isceobj/Sensor/db/ers_slc/CMakeLists.txt
@ -0,0 +1,15 @@
+InstallSameDir(
+    crdc-sardpf_image_record.xml
+    facility_record.xml
+    facility_related_pcs_record.xml
+    file_pointer_record.xml
+    image_file.xml
+    image_record.xml
+    leader_file.xml
+    map_proj_record.xml
+    new-d-paf_image_record.xml
+    platform_position_record.xml
+    scene_record.xml
+    text_record.xml
+    volume_descriptor.xml
+    )
--- a/components/isceobj/Sensor/db/jers/CMakeLists.txt
+++ b/components/isceobj/Sensor/db/jers/CMakeLists.txt
@ -0,0 +1,12 @@
+InstallSameDir(
+    facility_record.xml
+    file_pointer_record.xml
+    image_file.xml
+    image_record.xml
+    leader_file.xml
+    map_proj_record.xml
+    platform_position_record.xml
+    scene_record.xml
+    text_record.xml
+    volume_descriptor.xml
+    )
--- a/components/isceobj/Sensor/db/radarsat/CMakeLists.txt
+++ b/components/isceobj/Sensor/db/radarsat/CMakeLists.txt
@ -0,0 +1,18 @@
+InstallSameDir(
+    attitude_record.xml
+    data_histogram_record.xml
+    data_quality_summary_record.xml
+    detailed_processing_record.xml
+    file_pointer_record.xml
+    image_file.xml
+    image_record.xml
+    leader_file.xml
+    map_proj_record.xml
+    platform_position_record.xml
+    radiometric_compensation_record.xml
+    radiometric_record.xml
+    scene_record.xml
+    text_record.xml
+    trailer_file.xml
+    volume_descriptor.xml
+    )
--- a/components/isceobj/Sensor/db/radarsat_slc/CMakeLists.txt
+++ b/components/isceobj/Sensor/db/radarsat_slc/CMakeLists.txt
@ -0,0 +1,18 @@
+InstallSameDir(
+    attitude_record.xml
+    data_histogram_record.xml
+    data_quality_summary_record.xml
+    detailed_processing_record.xml
+    file_pointer_record.xml
+    image_file.xml
+    image_record.xml
+    leader_file.xml
+    map_proj_record.xml
+    platform_position_record.xml
+    radiometric_compensation_record.xml
+    radiometric_record.xml
+    scene_record.xml
+    text_record.xml
+    trailer_file.xml
+    volume_descriptor.xml
+    )
--- a/components/isceobj/Sensor/db/risat/CMakeLists.txt
+++ b/components/isceobj/Sensor/db/risat/CMakeLists.txt
@ -0,0 +1,18 @@
+InstallSameDir(
+    attitude_record.xml
+    data_histogram_record.xml
+    data_quality_summary_record.xml
+    detailed_processing_record.xml
+    file_pointer_record.xml
+    image_file.xml
+    image_record.xml
+    leader_file.xml
+    map_proj_record.xml
+    platform_position_record.xml
+    radiometric_compensation_record.xml
+    radiometric_record.xml
+    scene_record.xml
+    text_record.xml
+    trailer_file.xml
+    volume_descriptor.xml
+    )
--- a/components/isceobj/Sensor/db/risat_slc/CMakeLists.txt
+++ b/components/isceobj/Sensor/db/risat_slc/CMakeLists.txt
@ -0,0 +1,18 @@
+InstallSameDir(
+    attitude_record.xml
+    data_histogram_record.xml
+    data_quality_summary_record.xml
+    detailed_processing_record.xml
+    file_pointer_record.xml
+    image_file.xml
+    image_record.xml
+    leader_file.xml
+    map_proj_record.xml
+    platform_position_record.xml
+    radiometric_compensation_record.xml
+    radiometric_record.xml
+    scene_record.xml
+    text_record.xml
+    trailer_file.xml
+    volume_descriptor.xml
+    )
--- a/components/zerodop/GPUampcor/CMakeLists.txt
+++ b/components/zerodop/GPUampcor/CMakeLists.txt
@ -11,9 +11,12 @@ cython_add_module(GPUampcor
    src/AmpcorFFT.cpp
    src/AmpcorMethods.cpp
    )
-target_include_directories(GPUampcor PUBLIC
+target_include_directories(GPUampcor PRIVATE
    include
    )
+target_compile_definitions(GPUampcor PRIVATE
+    GPU_ACC_ENABLED
+    )
 target_link_libraries(GPUampcor PRIVATE
    CUDA::cublas
    isce2::DataAccessorLib
--- a/components/zerodop/GPUgeo2rdr/CMakeLists.txt
+++ b/components/zerodop/GPUgeo2rdr/CMakeLists.txt
@ -8,9 +8,12 @@ cython_add_module(GPUgeo2rdr
    src/Orbit.cpp
    src/Poly1d.cpp
    )
-target_include_directories(GPUgeo2rdr PUBLIC
+target_include_directories(GPUgeo2rdr PRIVATE
    include
    )
+target_compile_definitions(GPUgeo2rdr PRIVATE
+    GPU_ACC_ENABLED
+    )
 target_link_libraries(GPUgeo2rdr PRIVATE
    isce2::DataAccessorLib
    )
--- a/components/zerodop/GPUresampslc/CMakeLists.txt
+++ b/components/zerodop/GPUresampslc/CMakeLists.txt
@ -9,6 +9,9 @@ cython_add_module(GPUresampslc
 target_include_directories(GPUresampslc PRIVATE
    include
    )
+target_compile_definitions(GPUresampslc PRIVATE
+    GPU_ACC_ENABLED
+    )
 target_link_libraries(GPUresampslc PRIVATE
    isce2::DataAccessorLib
    OpenMP::OpenMP_CXX
--- a/components/zerodop/GPUtopozero/CMakeLists.txt
+++ b/components/zerodop/GPUtopozero/CMakeLists.txt
@ -16,6 +16,9 @@ cython_add_module(GPUtopozero
 target_include_directories(GPUtopozero PRIVATE
    include
    )
+target_compile_definitions(GPUtopozero PRIVATE
+    GPU_ACC_ENABLED
+    )
 target_link_libraries(GPUtopozero PRIVATE
    isce2::DataAccessorLib
    OpenMP::OpenMP_CXX
--- a/components/zerodop/GPUtopozero/src/AkimaLib.cpp
+++ b/components/zerodop/GPUtopozero/src/AkimaLib.cpp
@ -9,14 +9,13 @@

 #include <algorithm>
 #include <vector>
-#include <cmath>
+#include <math.h>
 #include <cstdio>
 #include "AkimaLib.h"
 #include "Constants.h"
 using std::max;
 using std::min;
 using std::vector;
-using std::isnan;

 bool AkimaLib::aki_almostEqual(double x, double y) {
    bool ret = (abs(x - y) <= AKI_EPS) ? true : false; // Compressed version is a little cleaner