KJ135
/
ISCE_INSAR
mirror of http://172.16.0.12:5000/WBJY/ISCE_INSAR.git
4
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #43 from piyushrpt/omp 

OMP threads cap fix
LT1AB
piyushrpt 2019-06-13 08:59:29 -07:00 committed by GitHub
parent 25d252c88b 930c56d3b8
commit d197c32d1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
SConstruct
View File

@ -141,12 +141,13 @@ else:
gdal_version = os.popen('gdal-config --version').read() gdal_version = os.popen('gdal-config --version').read()
print('GDAL version: {0}'.format(gdal_version)) print('GDAL version: {0}'.format(gdal_version))
try: try:
gdal_majorversion = int(gdal_version.split('.')[0])
gdal_subversion = int(gdal_version.split('.')[1]) gdal_subversion = int(gdal_version.split('.')[1])
except: except:
raise Exception('gdal-config not found. GDAL does not appear to be installed ... cannot proceed. If you have installed gdal, ensure that you have path to gdal-config in your environment') raise Exception('gdal-config not found. GDAL does not appear to be installed ... cannot proceed. If you have installed gdal, ensure that you have path to gdal-config in your environment')
env['GDALISCXX11'] = None env['GDALISCXX11'] = None
if gdal_subversion >= 3: if (gdal_majorversion > 2) or (gdal_subversion >= 3):
env['GDALISCXX11'] = 'True' env['GDALISCXX11'] = 'True'

5
components/stdproc/stdproc/resamp_slc/src/resamp_slc.f90
View File

@ -21,7 +21,7 @@
integer i, j, k integer i, j, k
integer int_az_off integer int_az_off
integer i_na integer i_na
integer ith, thnum integer ith, thnum, ithorig
integer ii, jj integer ii, jj
integer chipi, chipj integer chipi, chipj
@ -82,6 +82,7 @@
!$OMP END MASTER !$OMP END MASTER
!$OMP END PARALLEL !$OMP END PARALLEL
ithorig = ith
ith = min(ith,8) ith = min(ith,8)
print *, 'Number of threads: ', ith print *, 'Number of threads: ', ith
call omp_set_num_threads(ith) call omp_set_num_threads(ith)
@ -283,6 +284,8 @@
deallocate(rout) deallocate(rout)
endif endif
!Reset number of threads
call omp_set_num_threads(ithorig)
end end