From 137573cd1c172420a23c78b1e1c57102686dceea Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Fri, 5 Mar 2021 10:36:38 -0800 Subject: [PATCH 1/4] Add sanity check for sensors --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 183cbec..2dab45d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -133,6 +133,7 @@ jobs: topsApp.py --help --steps stripmapApp.py --help --steps python3 -c "import isce" + python3 -c "import isce; from isceobj.Sensor import SENSORS as s; [s[k]() for k in s]" build: docker: - image: docker:stable-git From e608eaf31993d89b13d362f54cfc1c3fdf16312c Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Fri, 5 Mar 2021 10:48:46 -0800 Subject: [PATCH 2/4] Add missing src file to ALOS_lib --- components/stdproc/alosreformat/ALOS_lib/src/SConscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/stdproc/alosreformat/ALOS_lib/src/SConscript b/components/stdproc/alosreformat/ALOS_lib/src/SConscript index c0bd1dc..e766ab6 100644 --- a/components/stdproc/alosreformat/ALOS_lib/src/SConscript +++ b/components/stdproc/alosreformat/ALOS_lib/src/SConscript @@ -35,7 +35,7 @@ import os Import('envALOS_lib') build = envALOS_lib['PRJ_LIB_DIR'] -listFiles = ['cfft1d.c','fftpack.c','rng_compress.c','find_fft_length.c','ALOS_ldr_orbit.c','calc_dop.c','hermite_c.c','interpolate_ALOS_orbit.c','read_ALOS_sarleader.c','utils.c'] +listFiles = ['cfft1d.c','fftpack.c','rng_compress.c','find_fft_length.c','ALOS_ldr_orbit.c','calc_dop.c','hermite_c.c','image_sio.c','interpolate_ALOS_orbit.c','read_ALOS_sarleader.c','utils.c'] lib = envALOS_lib.Library(target = 'ALOSStd', source = listFiles) envALOS_lib.Install(build,lib) envALOS_lib.Alias('build',build) From 74059bbd5c0866042df4bd20271acf131c559ab0 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Fri, 5 Mar 2021 11:00:14 -0800 Subject: [PATCH 3/4] Fix alos bindings This has been broken since splitting up image_sio.c/h in some edge casses. The extern variables are not "weakly linked" on macOS SCons so they must be visible to the module even if they are not used. --- components/isceobj/Sensor/bindings/SConscript | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/components/isceobj/Sensor/bindings/SConscript b/components/isceobj/Sensor/bindings/SConscript index dcdb8b4..87c3ca2 100644 --- a/components/isceobj/Sensor/bindings/SConscript +++ b/components/isceobj/Sensor/bindings/SConscript @@ -13,7 +13,8 @@ libList2 = ['cosar','DataAccessor','InterleavedAccessor'] envSensor1.PrependUnique(LIBS = libList1) envSensor2.PrependUnique(LIBS = libList2) -alosmodule = envSensor1.LoadableModule(target = 'alos.abi3.so', source = 'alosmodule.cpp') +alosmodule = envSensor1.LoadableModule(target = 'alos.abi3.so', + source = [ 'alosmodule.cpp', '../src/ALOS_pre_process/image_sio.c' ]) envSensor1.Install(install,alosmodule) cosarmodule = envSensor2.LoadableModule(target = 'cosar.abi3.so', source = 'cosarmodule.cpp') From e120774c1807adfae64d694917961bba73146756 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Fri, 5 Mar 2021 11:08:40 -0800 Subject: [PATCH 4/4] Fix circleci jobs Prefer native apk over pip when possible --- .circleci/config.yml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2dab45d..fa16804 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -144,9 +144,8 @@ jobs: name: Install dependencies command: | apk add --no-cache \ - python3-dev py3-pip bash pigz build-base libffi-dev openssl-dev - pip install \ - docker-compose awscli + python3-dev py3-pip bash pigz build-base libffi-dev openssl-dev \ + docker-compose aws-cli - run: name: Build docker image command: | @@ -171,9 +170,8 @@ jobs: name: Install dependencies command: | apk add --no-cache \ - python3-dev py3-pip bash pigz build-base libffi-dev openssl-dev - pip install \ - docker-compose awscli + python3-dev py3-pip bash pigz build-base libffi-dev openssl-dev \ + docker-compose aws-cli - run: name: Build docker image command: | @@ -197,9 +195,8 @@ jobs: name: Install dependencies command: | apk add --no-cache \ - python3-dev py3-pip bash pigz build-base libffi-dev openssl-dev - pip install \ - docker-compose awscli + python3-dev py3-pip bash pigz build-base libffi-dev openssl-dev \ + docker-compose aws-cli - run: name: Build docker image command: |