diff --git a/components/isceobj/Util/denseoffsets/src/denseoffsetsRead.F b/components/isceobj/Util/denseoffsets/src/denseoffsetsRead.F index fa2178320..76c45407a 100644 --- a/components/isceobj/Util/denseoffsets/src/denseoffsetsRead.F +++ b/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 diff --git a/components/isceobj/Util/estimateoffsets/src/estimateoffsetsRead.F b/components/isceobj/Util/estimateoffsets/src/estimateoffsetsRead.F index a8f5b2eed..2f40721c5 100644 --- a/components/isceobj/Util/estimateoffsets/src/estimateoffsetsRead.F +++ b/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 diff --git a/contrib/PyCuAmpcor/src/SConscript b/contrib/PyCuAmpcor/src/SConscript index 7b7d6f177..38d2e14d0 100644 --- a/contrib/PyCuAmpcor/src/SConscript +++ b/contrib/PyCuAmpcor/src/SConscript @@ -17,18 +17,13 @@ listFiles = ['GDALImage.cpp', 'cuArrays.cpp', 'cuArraysCopy.cu', 'cuAmpcorController.cpp', 'cuCorrFrequency.cu', 'cuAmpcorChunk.cpp', 'cuEstimateStats.cu'] -lib = envPyCuAmpcor.SharedLibrary(target = 'PyCuAmpcor', source= listFiles, SHLIBPREFIX='') - # add gdal include path gdal_cflags = subprocess.check_output('gdal-config --cflags', shell=True)[:-1].decode('utf-8') envPyCuAmpcor.Append(ENABLESHAREDNVCCFLAG = ' -DNDEBUG ' + gdal_cflags) -envPyCuAmpcor.Install(build,lib) -envPyCuAmpcor.Alias('install', build) - def pybind11PseudoBuilder(env, src, bld, inst): listFiles = [ src ] - env.MergeFlags('-fopenmp -O3 -std=c++11 -fPIC -pthread -Wno-unused-result -Wsign-compare -DNDEBUG -g -fwrapv -Wall -Wstrict-prototypes') + env.MergeFlags('-fopenmp -O3 -std=c++11 -fPIC -pthread -Wno-unused-result -Wsign-compare -DNDEBUG -g -fwrapv -Wall') libList = ['gdal'] env.PrependUnique(LIBS=libList) env.Append(CPPDEFINES = 'GPU_ACC_ENABLED')