From 785bb40efd7bf31a37f0a3cbd753b0db45420d6f Mon Sep 17 00:00:00 2001 From: Lijun Zhu <38738201+lijun99@users.noreply.github.com> Date: Mon, 8 Feb 2021 10:07:41 -0800 Subject: [PATCH 1/3] GPUtopozero: change isnan reference for compatibility with gcc<6 (#229) --- components/zerodop/GPUtopozero/src/AkimaLib.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/components/zerodop/GPUtopozero/src/AkimaLib.cpp b/components/zerodop/GPUtopozero/src/AkimaLib.cpp index 7f4ce8e..e663c92 100644 --- a/components/zerodop/GPUtopozero/src/AkimaLib.cpp +++ b/components/zerodop/GPUtopozero/src/AkimaLib.cpp @@ -9,14 +9,13 @@ #include #include -#include +#include #include #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 From a7c28ddc586309f4ca51e6e9adf0210a3c043ba5 Mon Sep 17 00:00:00 2001 From: Lijun Zhu Date: Tue, 9 Feb 2021 09:40:35 -0800 Subject: [PATCH 2/3] GPU modules: add GPU_ACC_ENABLED flag to cmake --- components/zerodop/GPUampcor/CMakeLists.txt | 5 ++++- components/zerodop/GPUgeo2rdr/CMakeLists.txt | 5 ++++- components/zerodop/GPUresampslc/CMakeLists.txt | 3 +++ components/zerodop/GPUtopozero/CMakeLists.txt | 3 +++ 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/components/zerodop/GPUampcor/CMakeLists.txt b/components/zerodop/GPUampcor/CMakeLists.txt index 6c6b95a..c9b30a8 100644 --- 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 diff --git a/components/zerodop/GPUgeo2rdr/CMakeLists.txt b/components/zerodop/GPUgeo2rdr/CMakeLists.txt index 531fb8a..07afdef 100644 --- 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 ) diff --git a/components/zerodop/GPUresampslc/CMakeLists.txt b/components/zerodop/GPUresampslc/CMakeLists.txt index 4dbb1bf..c1749d0 100644 --- 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 diff --git a/components/zerodop/GPUtopozero/CMakeLists.txt b/components/zerodop/GPUtopozero/CMakeLists.txt index f019e20..855a08a 100644 --- 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 From 4f0ed3a359ed8eeecd79525abbcc3722e70ee32a Mon Sep 17 00:00:00 2001 From: Bryan Marfito Date: Fri, 12 Feb 2021 08:35:13 +0800 Subject: [PATCH 3/3] Fix Cmake lists for db folder (#235) --- components/isceobj/Sensor/db/CMakeLists.txt | 9 +++++++++ .../Sensor/db/alos2_slc/CMakeLists.txt | 19 +++++++++++++++++++ .../isceobj/Sensor/db/alos_slc/CMakeLists.txt | 18 ++++++++++++++++++ .../isceobj/Sensor/db/ers/CMakeLists.txt | 15 +++++++++++++++ .../isceobj/Sensor/db/ers_slc/CMakeLists.txt | 15 +++++++++++++++ .../isceobj/Sensor/db/jers/CMakeLists.txt | 12 ++++++++++++ .../isceobj/Sensor/db/radarsat/CMakeLists.txt | 18 ++++++++++++++++++ .../Sensor/db/radarsat_slc/CMakeLists.txt | 18 ++++++++++++++++++ .../isceobj/Sensor/db/risat/CMakeLists.txt | 18 ++++++++++++++++++ .../Sensor/db/risat_slc/CMakeLists.txt | 18 ++++++++++++++++++ 10 files changed, 160 insertions(+) create mode 100644 components/isceobj/Sensor/db/alos2_slc/CMakeLists.txt create mode 100644 components/isceobj/Sensor/db/alos_slc/CMakeLists.txt create mode 100644 components/isceobj/Sensor/db/ers/CMakeLists.txt create mode 100644 components/isceobj/Sensor/db/ers_slc/CMakeLists.txt create mode 100644 components/isceobj/Sensor/db/jers/CMakeLists.txt create mode 100644 components/isceobj/Sensor/db/radarsat/CMakeLists.txt create mode 100644 components/isceobj/Sensor/db/radarsat_slc/CMakeLists.txt create mode 100644 components/isceobj/Sensor/db/risat/CMakeLists.txt create mode 100644 components/isceobj/Sensor/db/risat_slc/CMakeLists.txt diff --git a/components/isceobj/Sensor/db/CMakeLists.txt b/components/isceobj/Sensor/db/CMakeLists.txt index d4a9ab7..a78bba5 100644 --- 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) diff --git a/components/isceobj/Sensor/db/alos2_slc/CMakeLists.txt b/components/isceobj/Sensor/db/alos2_slc/CMakeLists.txt new file mode 100644 index 0000000..86ddc9a --- /dev/null +++ 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 + ) \ No newline at end of file diff --git a/components/isceobj/Sensor/db/alos_slc/CMakeLists.txt b/components/isceobj/Sensor/db/alos_slc/CMakeLists.txt new file mode 100644 index 0000000..2a2fda3 --- /dev/null +++ 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 + ) \ No newline at end of file diff --git a/components/isceobj/Sensor/db/ers/CMakeLists.txt b/components/isceobj/Sensor/db/ers/CMakeLists.txt new file mode 100644 index 0000000..bf35829 --- /dev/null +++ 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 + ) \ No newline at end of file diff --git a/components/isceobj/Sensor/db/ers_slc/CMakeLists.txt b/components/isceobj/Sensor/db/ers_slc/CMakeLists.txt new file mode 100644 index 0000000..bf35829 --- /dev/null +++ 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 + ) \ No newline at end of file diff --git a/components/isceobj/Sensor/db/jers/CMakeLists.txt b/components/isceobj/Sensor/db/jers/CMakeLists.txt new file mode 100644 index 0000000..61df8c5 --- /dev/null +++ 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 + ) \ No newline at end of file diff --git a/components/isceobj/Sensor/db/radarsat/CMakeLists.txt b/components/isceobj/Sensor/db/radarsat/CMakeLists.txt new file mode 100644 index 0000000..2a2fda3 --- /dev/null +++ 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 + ) \ No newline at end of file diff --git a/components/isceobj/Sensor/db/radarsat_slc/CMakeLists.txt b/components/isceobj/Sensor/db/radarsat_slc/CMakeLists.txt new file mode 100644 index 0000000..2a2fda3 --- /dev/null +++ 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 + ) \ No newline at end of file diff --git a/components/isceobj/Sensor/db/risat/CMakeLists.txt b/components/isceobj/Sensor/db/risat/CMakeLists.txt new file mode 100644 index 0000000..2a2fda3 --- /dev/null +++ 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 + ) \ No newline at end of file diff --git a/components/isceobj/Sensor/db/risat_slc/CMakeLists.txt b/components/isceobj/Sensor/db/risat_slc/CMakeLists.txt new file mode 100644 index 0000000..2a2fda3 --- /dev/null +++ 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 + ) \ No newline at end of file