Skip to content

Two patches for scons to run properly #946

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Two patches for scons to run properly #946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68a4199
patch getLineBand in some fortran code
Apr 3, 2025
59b19c8
PyCuAmpcor: patch the scons script for the two different actions issue
Apr 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions components/isceobj/Util/denseoffsets/src/denseoffsetsRead.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions components/isceobj/Util/estimateoffsets/src/estimateoffsetsRead.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand All @@ -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
7 changes: 1 addition & 6 deletions contrib/PyCuAmpcor/src/SConscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down