fix autoRIFT build on centos7 and conda python 3.8

- build autoRIFT using yum-installed opencv
- fix conda dependency resolution failure
- update SConfigISCE and SConfigISCE.cuda files for python 3.8
- fix CircleCI jobs

.circleci/config.yml

@@ -23,8 +23,8 @@ jobs:
             pwd
             mkdir config build install
             . /opt/conda/bin/activate root
-            conda install -y cython gdal h5py libgdal pytest numpy fftw scipy scons hdf4 hdf5 netcdf4 libgcc libstdcxx-ng cmake astropy
+            conda install -y cython gdal h5py libgdal pytest numpy fftw scipy scons hdf4 hdf5 libgcc libstdcxx-ng cmake astropy
-            yum install -y x11-devel motif-devel jq gcc-gfortran
+            yum install -y x11-devel motif-devel jq gcc-gfortran opencv opencv-devel opencv-python
 
       - run:
           name: Build and Install ISCE
@@ -77,8 +77,8 @@ jobs:
             pwd
             mkdir config build install
             . /opt/conda/bin/activate root
-            conda install --yes cython gdal h5py libgdal pytest numpy fftw scipy scons hdf4 hdf5 netcdf4 libgcc libstdcxx-ng cmake astropy opencv
+            conda install --yes cython gdal h5py libgdal pytest numpy fftw scipy scons hdf4 hdf5 libgcc libstdcxx-ng cmake astropy
-            yum install -y uuid-devel x11-devel motif-devel jq gcc-gfortran
+            yum install -y uuid-devel x11-devel motif-devel jq gcc-gfortran opencv opencv-devel opencv-python
             ln -s /opt/conda/bin/cython /opt/conda/bin/cython3
             cd /opt/conda/lib
             unlink libuuid.so
@@ -97,7 +97,7 @@ jobs:
               echo "PRJ_SCONS_BUILD = /root/project/build" > SConfigISCE
               echo "PRJ_SCONS_INSTALL = /root/project/install/isce" >> SConfigISCE
               echo "LIBPATH = /usr/lib64 /usr/lib /opt/conda/lib" >> SConfigISCE
-              echo "CPPPATH = /opt/conda/include/python3.7m /opt/conda/lib/python3.7/site-packages/numpy/core/include /opt/conda/include /usr/include" >> SConfigISCE
+              echo "CPPPATH = /opt/conda/include/python3.8 /opt/conda/lib/python3.8/site-packages/numpy/core/include /opt/conda/include /usr/include" >> SConfigISCE
               echo "FORTRANPATH =  /usr/include /opt/conda/include" >> SConfigISCE
               echo "FORTRAN = /bin/gfortran" >> SConfigISCE
               echo "CC = /bin/gcc" >> SConfigISCE

docker/Dockerfile

@@ -34,12 +34,11 @@ RUN set -ex \
       scons \
       hdf4 \
       hdf5 \
-      netcdf4 \
       libgcc \
       libstdcxx-ng \
       cmake \
-      opencv \
  && yum install -y uuid-devel x11-devel motif-devel jq \
+    opencv opencv-devel opencv-python \
  && ln -sf /opt/conda/bin/cython /opt/conda/bin/cython3 \
  && mkdir -p /opt/isce2/src
 
@@ -64,6 +63,7 @@ COPY . /opt/isce2/src/isce2
 RUN set -ex \
  && . /opt/conda/bin/activate root \
  && cd /opt/isce2/src/isce2 \
+ && tar xvf stanford_components.tgz \
  && source docker/build_env.sh \
  && mkdir -p $BUILD_DIR \
  && cp docker/SConfigISCE configuration/SConfigISCE \
@@ -101,7 +101,6 @@ RUN set -ex \
       scipy \
       hdf4 \
       hdf5 \
-      netcdf4 \
  && sudo yum update -y \
  && sudo yum install -y uuid-devel x11-devel motif-devel gcc-gfortran \
  && cd /opt/conda/lib \

docker/Dockerfile.cuda

@@ -34,11 +34,11 @@ RUN set -ex \
       scons \
       hdf4 \
       hdf5 \
-      netcdf4 \
       libgcc \
       libstdcxx-ng \
       cmake \
  && yum install -y uuid-devel x11-devel motif-devel jq \
+    opencv opencv-devel opencv-python \
  && ln -sf /opt/conda/bin/cython /opt/conda/bin/cython3 \
  && mkdir -p /opt/isce2/src
 
@@ -63,13 +63,13 @@ COPY . /opt/isce2/src/isce2
 RUN set -ex \
  && . /opt/conda/bin/activate root \
  && cd /opt/isce2/src/isce2 \
+ && tar xvf stanford_components.tgz \
  && source docker/build_env.sh \
  && mkdir -p $BUILD_DIR \
  && cp docker/SConfigISCE.cuda configuration/SConfigISCE \
  && scons install \
  && cp docker/isce_env.sh $ISCE_INSTALL_ROOT \
  && cd /tmp \
- && rm -rf /opt/isce2/src \
  && mkdir -p /tmp/rpm-build/opt \
  && mv $ISCE_INSTALL_ROOT /tmp/rpm-build/opt \
  && curl -s https://api.github.com/repos/$ISCE_ORG/isce2/git/refs/heads/main \
@@ -101,7 +101,6 @@ RUN set -ex \
       scipy \
       hdf4 \
       hdf5 \
-      netcdf4 \
  && sudo yum update -y \
  && sudo yum install -y uuid-devel x11-devel motif-devel gcc-gfortran \
  && cd /opt/conda/lib \

docker/SConfigISCE

@@ -10,7 +10,7 @@ LIBPATH = /usr/lib64 /usr/lib /opt/conda/lib
 
 # The location of Python.h. If you have multiple installations of python
 # make sure that it points to the right one
-CPPPATH = /opt/conda/include/python3.7m /opt/conda/lib/python3.7/site-packages/numpy/core/include /opt/conda/include /usr/include
+CPPPATH = /opt/conda/include/python3.8 /opt/conda/lib/python3.8/site-packages/numpy/core/include /opt/conda/include /usr/include
 
 # The location of the fftw3.h (most likely something like /usr/include or
 # /usr/local/include /opt/local/include

docker/SConfigISCE.cuda

@@ -10,7 +10,7 @@ LIBPATH = /usr/lib64 /usr/lib /opt/conda/lib
 
 # The location of Python.h. If you have multiple installations of python
 # make sure that it points to the right one
-CPPPATH = /opt/conda/include/python3.7m /opt/conda/lib/python3.7/site-packages/numpy/core/include /opt/conda/include /usr/include
+CPPPATH = /opt/conda/include/python3.8 /opt/conda/lib/python3.8/site-packages/numpy/core/include /opt/conda/include /usr/include
 
 # The location of the fftw3.h (most likely something like /usr/include or
 # /usr/local/include /opt/local/include