From 7b781aec097c7029c802d25c01164b3233545671 Mon Sep 17 00:00:00 2001 From: piyushrpt Date: Sun, 9 Jun 2019 20:05:13 -0700 Subject: [PATCH 1/2] OMP threads cap fix --- components/stdproc/stdproc/resamp_slc/src/resamp_slc.f90 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/components/stdproc/stdproc/resamp_slc/src/resamp_slc.f90 b/components/stdproc/stdproc/resamp_slc/src/resamp_slc.f90 index 759d27e..f38e450 100644 --- a/components/stdproc/stdproc/resamp_slc/src/resamp_slc.f90 +++ b/components/stdproc/stdproc/resamp_slc/src/resamp_slc.f90 @@ -21,7 +21,7 @@ integer i, j, k integer int_az_off integer i_na - integer ith, thnum + integer ith, thnum, ithorig integer ii, jj integer chipi, chipj @@ -82,6 +82,7 @@ !$OMP END MASTER !$OMP END PARALLEL + ithorig = ith ith = min(ith,8) print *, 'Number of threads: ', ith call omp_set_num_threads(ith) @@ -283,6 +284,8 @@ deallocate(rout) endif + !Reset number of threads + call omp_set_num_threads(ithorig) end From 930c56d3b81c867fe149ba7430c0024686b8b7e2 Mon Sep 17 00:00:00 2001 From: piyushrpt Date: Mon, 10 Jun 2019 11:02:42 -0700 Subject: [PATCH 2/2] Fix for GDAL 3 --- SConstruct | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/SConstruct b/SConstruct index f0727c2..8e653fe 100644 --- a/SConstruct +++ b/SConstruct @@ -141,12 +141,13 @@ else: gdal_version = os.popen('gdal-config --version').read() print('GDAL version: {0}'.format(gdal_version)) try: + gdal_majorversion = int(gdal_version.split('.')[0]) gdal_subversion = int(gdal_version.split('.')[1]) 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') env['GDALISCXX11'] = None -if gdal_subversion >= 3: +if (gdal_majorversion > 2) or (gdal_subversion >= 3): env['GDALISCXX11'] = 'True'