Update fork

.circleci/config.yml

@@ -0,0 +1,46 @@
+version: 2.1
+jobs:
+  build:
+    docker:
+      - image: ubuntu:bionic
+    steps:
+      - checkout:
+          path: /home/ubuntu/fringe
+      - run:
+          name: Setup Miniconda
+          command: |
+            set -ex
+            apt update
+            apt install -y wget make
+            apt-get update --yes && apt-get upgrade --yes
+            cd /home/ubuntu
+            wget "https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh" -O miniconda.sh
+            bash miniconda.sh -b -p /home/ubuntu/miniconda
+            source /home/ubuntu/miniconda/etc/profile.d/conda.sh
+            conda activate base
+            conda env create -f fringe/docs/environment_linux.yml
+      - run:
+          name: Install FRInGE
+          command: |
+            set -ex
+            source /home/ubuntu/miniconda/etc/profile.d/conda.sh
+            conda activate fringe
+            cd /home/ubuntu 
+            mkdir build install
+            cd build
+            cmake -DCMAKE_INSTALL_PREFIX=../install ../fringe
+            make install
+
+      - run:
+          name: Test FRInGE
+          command: |
+              set -ex
+              source /home/ubuntu/miniconda/etc/profile.d/conda.sh
+              conda activate fringe
+              export PATH="/home/ubuntu/install/bin:$PATH"
+              export PYTHONPATH="/home/ubuntu/install/python:$PYTHONPATH"
+              export LD_LIBRARY_PATH="/home/ubuntu/install/lib:$LD_LIBRARY_PATH"
+              evd.py -h
+              nmap.py -h
+              ampdispersion.py -h
+              python3 /home/ubuntu/fringe/tests/evd/test_evd.py

CMakeLists.txt

@@ -1,24 +1,8 @@
-###CMake for building FRInGE
-
-
-###Make sure that symlinks are not being used.
-###From GMT's cmake related files
-get_filename_component (srcdir "${CMAKE_SOURCE_DIR}" REALPATH)
-get_filename_component (bindir "${CMAKE_BINARY_DIR}" REALPATH)
-
-###Minimum cmake version
 cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
-if (POLICY CMP0048)
-    cmake_policy(SET CMP0048 NEW)
-endif (POLICY CMP0048)
-
 
-option(WITH_CUDA "Set ON|OFF (default=ON) to build CUDA library" OFF)
-
-###Project
 project( FRINGE
          VERSION 0.1
-         LANGUAGES C CXX)
+         LANGUAGES CXX)
 
 ####!!!!-- Checking prerequisites --!!!!
 
@@ -32,7 +16,7 @@ set(CMAKE_CXX_STANDARD 11)
 FIND_PACKAGE(GDAL 3.0 REQUIRED)
 
 ###Find Armadillo
-FIND_PACKAGE(Armadillo REQUIRED)
+FIND_PACKAGE(Armadillo 8.100 REQUIRED)
 
 ###Find openmp
 find_package(OpenMP COMPONENTS CXX)
@@ -41,14 +25,14 @@ find_package(OpenMP COMPONENTS CXX)
 FIND_PACKAGE(LAPACK REQUIRED)
 
 ###Find python3
-FIND_PACKAGE(Python 3.6 COMPONENTS Interpreter Development )
+FIND_PACKAGE(Python 3.7 COMPONENTS Interpreter Development NumPy)
 include(useCython)
 
+find_package(pybind11 REQUIRED)
+
 ###Include FRINGE specific paths
 include (ConfigProject)
 
-FIND_PACKAGE(Numpy REQUIRED)
-
 ####!!!!-- End of checking prerequisites --!!!!
 
 

README.md

@@ -1,4 +1,7 @@
 # FRInGE
+
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/e9bacb9410384df98fe86fadc422a9ee)](https://app.codacy.com/gh/isce-framework/fringe?utm_source=github.com&utm_medium=referral&utm_content=isce-framework/fringe&utm_campaign=Badge_Grade_Dashboard)
+
 ------
 
 *Fine Resolution InSAR using Generalized Eigenvectors*

cmake/FindCython.cmake

@@ -28,7 +28,7 @@ find_package(Python 3.6)
 if(Python_Interpreter_FOUND)
   get_filename_component( _python_path ${Python_EXECUTABLE} PATH )
   find_program( CYTHON_EXECUTABLE
-      NAMES cython${Python_VERSION_MAJOR} cython-${Python_VERSION_MAJOR}.${Python_VERSION_MINOR} cython cython.bat
+	  NAMES cython${Python_VERSION_MAJOR} cython-${Python_VERSION_MAJOR}.${Python_VERSION_MINOR} cython cython.bat
     HINTS ${_python_path}
     )
 else()