Commit Graph

124 Commits (9b3e531ac5d6ad5e817d96044393fa0ccd8049a5)

Author SHA1 Message Date
Gerald Manipon f09213eb33
various updates from ARIA-related projects (#149)
* add Dockerfile and SConfigISCE to build cuda-enabled modules

* add Dockerfile and SConfigISCE to build cuda-enabled modules

* set correct name

* update for centos7 and cuda-dev image

* restore

* disable GPUampcor

* update

* save

* sync up Dockerfile updates

* fix base image

* change docker image names

* create gpu vs. cpu specific tags

* update with nodata WBD Stitcher

* fix segmentation fault when running sciflo workflows

- remove dependencies that downgrade the `geos` conda package

* sync fix for segmentation fault to cuda builds

* ping ffi to version 1.12.2

Latest version of ffi, 1.13.0, breaks installation of fpm:
```
$ sudo gem install --no-ri --no-rdoc fpm
Fetching: cabin-0.9.0.gem (100%)
Successfully installed cabin-0.9.0
Fetching: backports-3.17.2.gem (100%)
Successfully installed backports-3.17.2
Fetching: arr-pm-0.0.10.gem (100%)
Successfully installed arr-pm-0.0.10
Fetching: clamp-1.0.1.gem (100%)
Successfully installed clamp-1.0.1
Fetching: ffi-1.13.0.gem (100%)
ERROR:  Error installing fpm:
        ffi requires Ruby version >= 2.3.
```
TODO: remove pin when ffi's backwards compatiblity is restored.

* comment out unused import

* add build circleci job to PR tests

* pin ffi in cuda build

* revert logging hackery

* fix "target_include_directories called with non-compilable target type" errors

* Keep source directory for topsStack

Co-authored-by: dustinlo <dustin.k.lo@jpl.nasa.gov>
Co-authored-by: shitong01 <stchin@ntu.edu.sg>
Co-authored-by: Ryan Burns <47790121+rtburns-jpl@users.noreply.github.com>
2020-07-16 16:08:57 -07:00
Ryan Burns 1f947b4e42
Merge pull request #156 from piyushrpt/cmake
Fixing linking order and flags for mdx
2020-07-15 22:06:10 -07:00
piyushrpt 4449e78b79 fixing linking order and flags for mdx
Not using interfaces for motif
2020-07-15 21:43:12 -07:00
Heresh Fattahi eb3eff61a6
Merge branch 'master' into BLM 2020-07-02 15:03:10 -07:00
Paul A Rosen e03042f4e5 diversity: replaced oppressive language with neutral definitions of the images that comprise an interferogram through the entire repository 2020-07-02 12:40:49 -07:00
Zhang Yunjun c642ab2e9a cuDenseOffset: check across oversample win size 2020-06-28 19:24:09 -07:00
Zhang Yunjun 90d578fa5d cuDenseOffsets: expose --raw-osf and --corr-win-size option
contrib/PyCuAmpcor/cuDenseOffsets.py:
+ expose --raw-over-samp-factor option to change the raw data oversampling factor with default of 2
+ expose --corr-win-size option, which by default, is calculated automatically based on the search window size and raw oversampling factor
+ change the namespace key for the oversampling factor of correlation surface from 'oversample' to 'corr_oversample' to avoid ambiguity, the cmd option name is still the same, thus no different in the user side.
+ use vrt file for master / slave slc data loading folllowing https://github.com/isce-framework/isce2/pull/78
+ re-organize createParse() for readability
+ add example to argparse help

stripmapStack/MaskAndFilter.py:
+ fix a bug introduced in #https://github.com/isce-framework/isce2/pull/112
+ add example usage to help message
+ mask pixels with SNR == 0, for plotting only without touching data files
+ show input parameter in the figure title
+ show percentage after SNR thresholding
+ add interpolation for matplotlib while plotting

topsStack/grossOffsets: move obsolete basemap import from the top to the related commented code block
2020-06-28 19:24:09 -07:00
Ryan Burns a66dcfdb1b Merge branch 'master' into cmake 2020-06-12 18:36:55 -07:00
Ryan Burns ed25d657fa Update pycuampcor prereqs 2020-06-12 17:53:40 -07:00
Cheryl edea69d4b6 added buffer margin to orbit times in get_orbit 2020-06-11 23:33:37 -07:00
shitong01 0fb49e383e fix syntax 2020-06-11 23:33:37 -07:00
shitong01 bb03d8c652 changed made by @cheryltwj to fix orbit file download edge case 2020-06-11 23:33:37 -07:00
sssangha acf0bbb55c Negative valid samples/lines now set to 0 2020-06-06 20:44:00 -07:00
Ryan Burns b12fde65d8 Add PyCuAmpcor support 2020-05-28 18:02:17 -07:00
Ryan Burns 1ad638b1de Install watermask and upsampledem modules 2020-05-22 15:49:10 -07:00
Ryan Burns f3fa2b0c6f Fix ISSI libname and data installation 2020-05-22 15:49:10 -07:00
Zhang Yunjun 35a80f0a5f bugfix in stripmapStack/Stack for config unwIfg if filter is turned off
If filter is turned OFF while unwrapping is still ON, the phase unwrapping output filename should not include "filt_" prefix.
2020-05-17 14:58:39 -07:00
yunjunz af5a8540f9 bugfix in topsStack/Stack while writing config_unwrap for rmFilter option
stackSentinel: more msg in checkCurrentStatus()
2020-05-17 14:58:39 -07:00
Zhang Yunjun 659a7ed6b0 stackSentinel: use 2 digit number in run_files to better sort 10 or more steps
update topsStack/README.md accordingly.

stackSentinel: suppress matplotlib DEBUG msg

stackSentinel: remove the unused imp import
2020-05-17 14:58:39 -07:00
Zhang Yunjun 0f60e9f24c FilterAndCoh: move cpx coh calc into a func
related with https://github.com/isce-framework/isce2/pull/97

+ move cpx cohe calculation code from main() to estCpxCoherence()
+ move computeCoherence import from the top to the inside of estCpxCoherence(), to avoid import error/warning sometimes.
+ fix typo in the default value of --cc option from 'fine.cori.full' to 'fine.cor.full'
2020-05-17 14:58:39 -07:00
Ryan Burns e68db01bf9
Merge pull request #89 from rtburns-jpl/cmake
Add CMake build system
2020-05-08 12:42:01 -07:00
Zhang Yunjun 4282bb8e0a prepSlcALOS2: add --polarization to pass to unpackFrame* 2020-05-03 14:12:24 -07:00
Zhang Yunjun 6a78c4e6d6 skip filtering if --filter_strength <= 0
+ FilterAndCoherence: skip filtering if input filter strength <= 0 and use original phase for coherence estimation

+ Stack: do not add filt_ prefix to output file if input filter strength <= 0
2020-05-03 14:12:24 -07:00
Zhang Yunjun d494ae3924 Stack: adjust indentation 2020-05-03 14:12:24 -07:00
Zhang Yunjun 34fb0b66fa Stack: skip PU if input method is "no" 2020-05-03 14:12:24 -07:00
Zhang Yunjun d41ffb0ce9 stackStripMap: suppress matplotlib DEBUG msg 2020-05-03 14:12:24 -07:00
Heresh Fattahi c9dd735a7b
Merge pull request #125 from yunjunz/topo
stripmapStack/topo: call gdal2isce_xml.py inside runMultilook() if xml file missing
2020-05-03 09:22:50 -07:00
Ryan Burns 4863c238e8 Merge branch 'master' into cmake 2020-05-02 16:40:26 -07:00
Minyan Zhong 4f0a2f551c add a gpu ampcor driver 2020-05-02 15:52:31 -07:00
Ryan Burns 9f3ed02c89 Add fftwf to alos2filter libs 2020-05-02 13:05:12 -07:00
Ryan Burns 7cf564582a Merge branch 'master' into cmake 2020-05-02 12:32:20 -07:00
CunrenLiang 62e8abe85b fix the problem in downloading NASA DEM 2020-05-02 12:11:54 -07:00
Zhang Yunjun 8017039ecb topo: replace gdal_translate cmd call with gda.Translate()
+ add more print out message
2020-05-02 11:54:17 -07:00
Zhang Yunjun 08dfd9de21 topo: call gdal2isce_xml.py inside runMultilook() if xml file missing
+ topo: merge runMultilookGdal() into runMultilook() with new argument "method" to control to use isce Looks module (averaging) or gdal_translate (extraction; default, same as before).

+ topo: call gdal2isce_xml.py so that xml file for multilooked data are always generate. This fix the warning message from gdal_translate: "Warning 1: Geotransform matrix has non rotational terms"

+ topo: skip multilooking if the data file has vrt/xml file missing, which sometimes happens to incLocal and shadowMask (don't know the cause yet; I used GPU version).

+ crossmul/resampleSlc: re-organize module import at the top of scripts
2020-05-02 10:26:29 -07:00
Heresh Fattahi 9e7e090548
Merge pull request #113 from mirzaees/stack_runfiles
Stack runfiles
2020-05-02 10:13:25 -07:00
Sara Mirzaee a24f0e99bf Merge branch 'stack_runfiles' of https://github.com/mirzaees/isce2 into stack_runfiles 2020-05-01 14:53:51 -05:00
Sara Mirzaee 08e3849945 looping over lines instead of reading the whole file 2020-05-01 14:45:48 -05:00
Sara Mirzaee fe097c906a add --rmFilter to stackSentinel.py 2020-05-01 14:44:59 -05:00
CunrenLiang 9794a75f55 use FFTW to speed up filtering 2020-04-26 19:18:33 -07:00
sssangha e96a110221 Download of nasadem now supported in dem.py 2020-04-20 18:24:12 -07:00
sssangha be959c3b27 Download of nasadem now supported in dem.py 2020-04-20 18:24:12 -07:00
Ryan Burns 81b54197e6 Merge branch 'master' into cmake 2020-04-13 14:34:14 -07:00
Ryan Burns 23f2ffaa1e
Use exist_ok argument to makedirs when appropriate (#112)
@falkamelung noted a race condition in #106 due to non-atomic directory
checking followed by os.makedirs. This pattern exists in many places
in the codebase so I went ahead and replaced the rest of them.
The new exist_ok usage should be terser and more idiomatic.
2020-04-13 12:40:32 -07:00
Sara Mirzaee e1729de5a8
fix bug: some lines were commented by mistake 2020-04-11 11:50:10 -04:00
Lijun Zhu 4cc13950a8 PyCuAmpcor: add gdal lib to link 2020-04-09 21:01:00 -07:00
Lijun Zhu 62a10d4c0d topsStack/cuDenseOffsets: call (included not standalone) PyCuAmpcor properly 2020-04-09 21:01:00 -07:00
Lijun Zhu 0855bf2640 DenseOffsets with PyCuAmpcor: use '.slc.vrt' instead of '.slc' as inputs 2020-04-09 21:01:00 -07:00
Lijun Zhu 434a71322f PyCuAmpcor: fixed #include gdal headers 2020-04-09 21:01:00 -07:00
Forrest Williams 16b7e10d32
Fix Burst Loading in Estimate Range and Azimuth Misreg (#110)
* Fix burst loading in estimateAzimuthMisreg.py

Within the for loop that starts at line 82, looping through range(minBurst, maxBurst) misses the burst with the maximum burst number. In cases where only one burst in a swath is used, the script fails at line 90 when .getWidth() is called on an empty xml. This issue can be fixed by adding the line maxBurst = maxBurst + 1

* Fix burst loading in estimateRangeMisreg.py

Similar to estimateAzimuthMisreg.py, calling range(minBurst,maxBurst) at line 185 will lead to an empty list and the some bursts not being loaded unless line 181 is changed from maxBurst = maxBurst - 1 to maxBurst = maxBurst +1
2020-04-09 20:57:44 -07:00
Sara Mirzaee dc97d160a4 add fine.unw to remove the effect of filtering 2020-04-09 01:14:26 -05:00