Pycuampcor v2

applications/topsApp.py

@@ -3,19 +3,19 @@
 
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 # Copyright 2012 California Institute of Technology. ALL RIGHTS RESERVED.
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 # http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# 
+#
 # United States Government Sponsorship acknowledged. This software is subject to
 # U.S. export control laws and regulations and has been classified as 'EAR99 NLR'
 # (No [Export] License Required except when exporting to an embargoed country,
@@ -295,6 +295,15 @@
 
 
 ######Adding stuff from topsOffsetApp for integration
+OFFSET_WORKFLOW = Application.Parameter(
+    'off_workflow',
+    public_name='Ampcor workflow',
+    default=0,
+    type=int,
+    mandatory=False,
+    doc='Ampcor workflow. 0 for Two-pass search (integer search then oversampled search). 1 for One-pass straight oversampled search.'
+                                        )
+
 WINDOW_SIZE_WIDTH = Application.Parameter(
     'winwidth',
     public_name='Ampcor window width',
@@ -660,6 +669,7 @@ class TopsInSAR(Application):
                       USE_VIRTUAL_FILES,
                       SWATHS,
                       ROI,
+                      OFFSET_WORKFLOW,
                       WINDOW_SIZE_HEIGHT,
                       WINDOW_SIZE_WIDTH,
                       SEARCH_WINDOW_HEIGHT,

applications/topsOffsetApp.py

@@ -2,19 +2,19 @@
 
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 # Copyright 2016 California Institute of Technology. ALL RIGHTS RESERVED.
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 # http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# 
+#
 # United States Government Sponsorship acknowledged. This software is subject to
 # U.S. export control laws and regulations and has been classified as 'EAR99 NLR'
 # (No [Export] License Required except when exporting to an embargoed country,
@@ -231,6 +231,15 @@
     doc='Application-specific parameter to indicate whether running topsApp or topsOffsetApp.'
                                     )
 
+OFFSET_WORKFLOW = Application.Parameter(
+    'off_workflow',
+    public_name='Ampcor workflow',
+    default=0,
+    type=int,
+    mandatory=False,
+    doc='Ampcor workflow. 0 for Two-pass search (integer search then oversampled search). 1 for One-pass straight oversampled search.'
+)
+
 OFFSET_GEOCODE_LIST = Application.Parameter(
     'off_geocode_list',
     public_name='offset geocode list',
@@ -246,6 +255,7 @@ class TopsOffset(TopsInSAR):
 
     # Pull TopsInSAR's parameter/facility lists
     parameter_list = TopsInSAR.parameter_list + ( \
+                     OFFSET_WORKFLOW,
                      WINDOW_SIZE_WIDTH,
                      WINDOW_SIZE_HEIGHT,
                      SEARCH_WINDOW_WIDTH,

components/isceobj/TopsProc/TopsProc.py

@@ -328,6 +328,14 @@
         mandatory=False,
         doc='Filename for gross dense offsets covariance. Used in runDenseOffsets.')
 
+OFFSET_PEAKVALUE_FILE = Component.Parameter(
+        'peakvaluefile',
+        public_name='Offset correlation surface peak value filename',
+        default='dense_offsets_peakvalue.bil',
+        type=str,
+        mandatory=False,
+        doc='Filename for gross offsets correlation surface peak values. Used in runDenseOffsets.')
+
 FILT_OFFSET_OUTPUT_FILE = Component.Parameter(
     'filt_offsetfile',
     public_name='Filtered offset filename',
@@ -342,6 +350,7 @@
         default = [OFFSET_OUTPUT_FILE,
                    OFFSET_SNR_FILE,
                    OFFSET_COV_FILE,
+                   OFFSET_PEAKVALUE_FILE,
                    FILT_OFFSET_OUTPUT_FILE],
         container = list,
         type=str,
@@ -395,6 +404,7 @@ class TopsProc(Component):
                       OFFSET_OUTPUT_FILE,
                       OFFSET_SNR_FILE,
                       OFFSET_COV_FILE,
+                      OFFSET_PEAKVALUE_FILE,
                       FILT_OFFSET_OUTPUT_FILE,
                       OFFSET_GEOCODE_LIST)
 

components/isceobj/TopsProc/runDenseOffsets.py

@@ -95,6 +95,7 @@ def runDenseOffsetsCPU(self):
     print('Gross offset across: %d' % (self.rgshift))
     print('Gross offset down: %d\n' % (self.azshift))
 
+    objOffset.workflow = self.off_workflow
     objOffset.setWindowSizeWidth(self.winwidth)
     objOffset.setWindowSizeHeight(self.winhgt)
     objOffset.setSearchWindowSizeWidth(self.srcwidth)
@@ -190,14 +191,19 @@ def runDenseOffsetsGPU(self):
     ### Set parameters
     # cross-correlation method, 0=Frequency domain, 1= Time domain
     objOffset.algorithm = 0
+    # ampcor workflow, 0=two-pass workflow, 1= one-pass workflow
+    objOffset.workflow = self.off_workflow
     # deramping method: 0 to take magnitude (fixed for Tops)
     objOffset.derampMethod = 0
-    objOffset.referenceImageName = reference + '.vrt'
+    objOffset.referenceImageName = reference
     objOffset.referenceImageHeight = length
     objOffset.referenceImageWidth = width
-    objOffset.secondaryImageName = secondary + '.vrt'
+    objOffset.referenceImageDataType = 2 if m.getDataType().upper().startswith('C') else 1
+    objOffset.secondaryImageName = secondary
     objOffset.secondaryImageHeight = length
     objOffset.secondaryImageWidth = width
+    objOffset.secondaryImageDataType = 2 if s.getDataType().upper().startswith('C') else 1
+
 
     # adjust the margin
     margin = max(self.margin, abs(self.azshift), abs(self.rgshift))
@@ -232,9 +238,9 @@ def runDenseOffsetsGPU(self):
     objOffset.nStreams = 2
     # number of windows in a chunk/batch
     objOffset.numberWindowDownInChunk = 1
-    objOffset.numberWindowAcrossInChunk = 64
+    objOffset.numberWindowAcrossInChunk = 20
     # memory map cache size in GB
-    objOffset.mmapSize = 16
+    objOffset.mmapSize = 4
 
     # Modify BIL in filename to BIP if needed and store for future use
     prefix, ext = os.path.splitext(self._insar.offsetfile)
@@ -247,11 +253,13 @@ def runDenseOffsetsGPU(self):
     objOffset.grossOffsetImageName = os.path.join(self._insar.mergedDirname, self._insar.offsetfile + ".gross")
     objOffset.snrImageName = os.path.join(self._insar.mergedDirname, self._insar.snrfile)
     objOffset.covImageName = os.path.join(self._insar.mergedDirname, self._insar.covfile)
+    objOffset.peakValueImageName = os.path.join(self._insar.mergedDirname, self._insar.peakvaluefile)
 
     # merge gross offset to final offset
     objOffset.mergeGrossOffset = 1
 
     ### print the settings
+    print('Workflow: %d\n' % (self.off_workflow))
     print('\nReference frame: %s' % (mf))
     print('Secondary frame: %s' % (sf))
     print('Main window size width: %d' % (self.winwidth))
@@ -268,6 +276,8 @@ def runDenseOffsetsGPU(self):
     print('Output gross offsets file name: %s' % (objOffset.grossOffsetImageName))
     print('Output SNR file name: %s' % (objOffset.snrImageName))
     print('Output COV file name: %s' % (objOffset.covImageName))
+    print('Output Correlation Surface Peak Value file name: %s' % (objOffset.peakValueImageName))
+    print(f'Number of windows: {objOffset.numberWindowDown} x {objOffset.numberWindowAcross}')
 
     # pass the parameters to C++ programs
     objOffset.setupParams()
@@ -332,6 +342,16 @@ def runDenseOffsetsGPU(self):
     covImg.setAccessMode('read')
     covImg.renderHdr()
 
+    peakValueImg = isceobj.createImage()
+    peakValueImg.setFilename(objOffset.peakValueImageName)
+    peakValueImg.setDataType('FLOAT')
+    peakValueImg.setBands(1)
+    peakValueImg.scheme = 'BIP'
+    peakValueImg.setWidth(objOffset.numberWindowAcross)
+    peakValueImg.setLength(objOffset.numberWindowDown)
+    peakValueImg.setAccessMode('read')
+    peakValueImg.renderHdr()
+
 
 if __name__ == '__main__' :
     '''

components/isceobj/Util/denseoffsets/src/denseoffsetsRead.F

@@ -39,7 +39,7 @@ subroutine readCpxAmp(acc,arr,irow,band,n,carr)
                     integer*8 :: acc
                     integer :: irow,band,n,i
 
-                    call getLineBand(acc,carr,band,irow)
+                    call getLineBand_c(acc,carr,band,irow)
                 end subroutine readCpxAmp
 
                 subroutine readAmp(acc,arr,irow,band,n,carr)
@@ -49,7 +49,7 @@ subroutine readAmp(acc,arr,irow,band,n,carr)
                     integer :: irow,band,n
                     integer :: i
 
-                    call getLineBand(acc,arr,band,irow)
+                    call getLineBand_r4(acc,arr,band,irow)
                     do i=1,n
                         carr(i) = cmplx(arr(i), 0.0)
                     enddo

components/isceobj/Util/estimateoffsets/src/estimateoffsetsRead.F

@@ -39,7 +39,7 @@ subroutine readCpxAmp(acc,arr,irow,band,n,carr)
                     integer*8 :: acc
                     integer :: irow,band,n,i
 
-                    call getLineBand(acc,carr,band,irow)
+                    call getLineBand_c(acc,carr,band,irow)
                     !call getLine(acc, carr, irow)
                     do i=1,n
                         arr(i) = cabs(carr(i))
@@ -52,7 +52,7 @@ subroutine readAmp(acc,arr,irow,band,n,carr)
                     integer*8 :: acc
                     integer :: irow,band,n
 
-                    call getLineBand(acc,arr,band,irow)
+                    call getLineBand_r4(acc,arr,band,irow)
                 end subroutine
 
         end module estimateoffsetsRead 

contrib/PyCuAmpcor/CMakeLists.txt

@@ -8,12 +8,16 @@ endif()
 
 set(CMAKE_CUDA_STANDARD 11)
 set(CMAKE_CUDA_STANDARD_REQUIRED TRUE)
+set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} --prec-div=true --prec-sqrt=true")
+
 
 pybind11_add_module(PyCuAmpcor
     src/PyCuAmpcor.cpp
-    src/GDALImage.cpp
+    src/SlcImage.cpp
     src/SConscript
-    src/cuAmpcorChunk.cpp
+    src/cuAmpcorProcessor.cpp
+    src/cuAmpcorProcessorTwoPass.cpp
+    src/cuAmpcorProcessorOnePass.cpp
     src/cuAmpcorController.cpp
     src/cuAmpcorParameter.cpp
     src/cuArrays.cpp

contrib/PyCuAmpcor/CMakeLists.txt.isce2

@@ -0,0 +1,50 @@
+# Early exit if prereqs not available
+if(NOT TARGET GDAL::GDAL
+OR NOT TARGET CUDA::cufft
+OR NOT pybind11_FOUND
+   )
+    return()
+endif()
+
+set(CMAKE_CUDA_STANDARD 11)
+set(CMAKE_CUDA_STANDARD_REQUIRED TRUE)
+set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} --prec-div=true --prec-sqrt=true")
+
+
+pybind11_add_module(PyCuAmpcor
+    src/PyCuAmpcor.cpp
+    src/SlcImage.cpp
+    src/SConscript
+    src/cuAmpcorProcessor.cpp
+    src/cuAmpcorProcessorTwoPass.cpp
+    src/cuAmpcorProcessorOnePass.cpp
+    src/cuAmpcorController.cpp
+    src/cuAmpcorParameter.cpp
+    src/cuArrays.cpp
+    src/cuArraysCopy.cu
+    src/cuArraysPadding.cu
+    src/cuCorrFrequency.cu
+    src/cuCorrNormalization.cu
+    src/cuCorrNormalizationSAT.cu
+    src/cuCorrNormalizer.cpp
+    src/cuCorrTimeDomain.cu
+    src/cuDeramp.cu
+    src/cuEstimateStats.cu
+    src/cuOffset.cu
+    src/cuOverSampler.cpp
+    src/cuSincOverSampler.cu
+    src/cudaError.cpp
+    src/cudaUtil.cpp
+    )
+target_include_directories(PyCuAmpcor PRIVATE
+    src
+    )
+target_link_libraries(PyCuAmpcor PRIVATE
+    CUDA::cufft
+    GDAL::GDAL
+    )
+
+InstallSameDir(
+    __init__.py
+    PyCuAmpcor
+    )