Commit af9201e1 authored by Kelvin Rodriguez's avatar Kelvin Rodriguez
Browse files

First draft of changing ISIS to work with conda

parent 4fd6a964

isis/cmake/FindAllDependencies.cmake

+5 −3
Original line number Diff line number Diff line
@@ -79,19 +79,19 @@ if(APPLE) 
  find_package(Qt5 COMPONENTS

                  Core

                  Concurrent

                  DBus

                  # DBus

                  Gui

                  Multimedia

                  MultimediaWidgets

                  Network

                  OpenGL # Needed to install mesa-common-dev for this!

                  Positioning

                  # Positioning

                  PrintSupport

                  Qml

                  Quick

                  Script

                  ScriptTools

                  Sensors

                  # Sensors

                  Sql

                  Svg

                  Test
@@ -183,6 +183,8 @@ find_package(TNT 126 REQUIRED) # TNT version is 1.2.6, but v007 direct 
find_package(XercesC   3.1.2   REQUIRED) # "xercesc/xercesc-${XercesC_FIND_VERSION}/"

find_package(X11       6       REQUIRED)

find_package(OpenGL            REQUIRED)

find_package(nanoflann         REQUIRED)

find_package(png               REQUIRED)

find_package(Kakadu)



# v007 might have different versions installed for our mac and linux systems.

isis/cmake/FindGeoTIFF.cmake

+1 −1
Original line number Diff line number Diff line
@@ -17,4 +17,4 @@ find_library(GEOTIFF_LIBRARY 
get_filename_component(GEOTIFF_ROOT_INCLUDE_DIR "${GEOTIFF_INCLUDE_DIR}" DIRECTORY)



message( "-- GEOTIFF INCLUDE DIR: ${GEOTIFF_INCLUDE_DIR}")

message( "-- GEOTIFF LIB: ${GSL_LIBRARY}")
 
message( "-- GEOTIFF LIB: ${GEOTIFF_LIBRARY}")

isis/cmake/Findnanoflann.cmake

0 → 100644
+15 −0
Original line number Diff line number Diff line 
# CMake module for find_package(GSL)

# Finds include directory and all applicable libraries

#

# Sets the following:

#   GSL_INCLUDE_DIR

#   GSL_LIBLIST



find_path(NANOFLANN_INCLUDE_DIR

  NAMES nanoflann.hpp

  PATH_SUFFIXES nanoflann/

)



get_filename_component(NANOFLANN_ROOT_INCLUDE_DIR "${NANOFLANN_INCLUDE_DIR}" DIRECTORY)



message( "-- NANOFLANN INCLUDE DIR: ${NANOFLANN_INCLUDE_DIR}")

isis/environment.yml

0 → 100644
+104 −0
Original line number Diff line number Diff line 
name: isisdeps

channels:

- anaconda

- krodriguez

- inria-pro-sed

- conda-forge

- usgs-astrogeology

- defaults

dependencies:

- libgcc=4.8.5=1

- blas=1.1=openblas

- boost=1.65.1=py27_0

- boost-cpp=1.65.1=1

- bzip2=1.0.6=1

- ca-certificates=2018.1.18=0

- cairo=1.14.6=4

- certifi=2018.1.18=py27_0

- cmake=3.9.1=0

- cspice=66=0

- curl=7.55.1=0

- dbus=1.10.22=0

- doxygen=1.8.14=0

- eigen=3.3.3=0

- expat=2.2.5=0

- ffmpeg=3.2.4=3

- flann=1.8.4=0

- fontconfig=2.12.1=4

- freetype=2.7=1

- geos=3.5.1=1

- geotiff=1.4.2=1

- gettext=0.19.8.1=0

- giflib=5.1.4=0

- glib=2.51.4=0

- gsl=2.2.1=blas_openblas_3

- harfbuzz=1.3.4=2

- hdf5=1.8.18=3

- icu=58.2=0

- jasper=1.900.1=4

- jpeg=9b=2

- krb5=1.14.2=0

- lapack=3.6.1=1

- libffi=3.2.1=3

- libgfortran=3.0.0=0

- libiconv=1.15=0

- libpng=1.6.28=2

- libssh2=1.8.0=2

- libtiff=4.0.9=0

- libuv=1.11.0=0

- libwebp=0.5.2=7

- libxcb=1.12=1

- libxml2=2.9.7=0

- m4=1.4.17=1

- metis=5.1.0=3

- nanoflann=1.2.2=0

- ncurses=5.9=10

- ninja=1.7.2=0

- nn=1.86.0=2

- numpy=1.13.3=py27_blas_openblas_200

- openblas=0.2.19=2

- opencv=3.3.0=py27_blas_openblas_200

- openssl=1.0.2n=0

- pcre=8.39=0

- pip=9.0.1=py27_1

- pixman=0.34.0=1

- proj4=4.9.3=5

- protobuf=3.2.0=py27_0

- python=2.7.14=4

- qt=5.6.2=h9e3eb04_4

- qwt=6.1.3=1

- readline=7.0=0

- rhash=1.3.4=0

- setuptools=38.5.1=py27_0

- six=1.11.0=py27_1

- sqlite=3.20.1=2

- suitesparse=4.5.4=blas_openblas_200

- superlu=5.2.1=blas_openblas_201

- tk=8.6.7=0

- wheel=0.30.0=py27_2

- x264=20131217=3

- xorg-kbproto=1.0.7=1

- xorg-libx11=1.6.4=6

- xorg-libxau=1.0.8=3

- xorg-libxdmcp=1.1.2=3

- xorg-xproto=7.0.31=6

- xz=5.2.3=0

- zlib=1.2.11=0

- openmpi=1.8.6=4

- parmetis=4.0.3p2=1

- jama=125=0

- tnt=126=0

- bullet=2.86.1=he2aa7b0_0

- ds9=7.5=h35e3669_0

- embree=2.16.0=h6834224_0

- gmm=5.0=h6aef312_0

- naif=n0066=h90cdba2_0

- patchelf=0.9=h879b6ae_0

- pcl=1.8.1=h7a71350_0

- qhull=7.2.0=h396fa31_0

- tbb=4.4=hf7780a4_0

- vtk=7.1.1=py27h56fd973_0

- xalan-c=1.11=h1922a5c_0

- xerces-c=3.1.4=h10f7eb2_0

prefix: /Users/krodriguez-pr/anaconda3/envs/isisdeps

isis/src/base/apps/equalizer/equalizer.cpp

+1 −4
Original line number Diff line number Diff line
@@ -70,9 +70,6 @@ void IsisMain() { 
        if (solveMethod == "SVD") {

          methodType = LeastSquares::SVD;

        }

        else if (solveMethod == "SPARSE") {

          methodType = LeastSquares::SPARSE;

        }



        equalizer.calculateStatistics(sampPercent, mincnt, wtopt, methodType);

      }