Ignore:
Timestamp:
Aug 30, 2017 11:23:42 AM (2 years ago)
Author:
Christian Andersson
Message:

Merged SuperLU changesets to the release branch. Related to ticket:5344

Location:
branches/2.1.x
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2.1.x

  • branches/2.1.x/Makefile.am

    r10075 r10102  
    1717ACLOCAL_AMFLAGS = -I m4
    1818
    19 SUBDIRS = ThirdParty/Sundials ThirdParty/Minpack ThirdParty/Blas ThirdParty/Lapack external/FMILibrary RuntimeLibrary Python
     19SUBDIRS = ThirdParty/SuperLU ThirdParty/Sundials ThirdParty/Minpack ThirdParty/Blas ThirdParty/Lapack external/FMILibrary RuntimeLibrary Python
    2020
    2121assimulo_install_dir=$(abs_builddir)/Assimulo_install
     
    165165
    166166if WITH_SUNDIALS
    167 if WITH_SUPERLU
     167if WITH_OPENMP
    168168    mkdir -p $(assimulo_build_dir); \
    169169    cd $(abs_top_srcdir)/external; \
     
    172172    case $(build) in \
    173173    *-cygwin*) \
    174     python setup.py install --sundials-home=$(SUNDIALS_HOME) --superlu-home=$(SUPERLU_HOME) --blas-home=$(abs_builddir)/blas_install/ --lapack-home=$(abs_builddir)/lapack_install/ --force-32bit="true" --extra-c-flags="-mincoming-stack-boundary=2" --prefix=$(assimulo_install_dir) ;; \
     174    python setup.py install --with_openmp=True --superlu-home=$(abs_builddir)/superlu_build/ --sundials-home=$(SUNDIALS_HOME) --sundials-with-superlu=True --blas-home=$(abs_builddir)/blas_install/ --lapack-home=$(abs_builddir)/lapack_install/ --force-32bit="true" --extra-c-flags="-mincoming-stack-boundary=2" --prefix=$(assimulo_install_dir) ;; \
    175175    *-mingw*) \
    176     python setup.py install --sundials-home=$(SUNDIALS_HOME) --superlu-home=$(SUPERLU_HOME) --blas-home=$(abs_builddir)/blas_install/ --lapack-home=$(abs_builddir)/lapack_install/ --force-32bit="true" $(NUMPY_NO_MSVCR_ARG) --extra-c-flags="-mincoming-stack-boundary=2" --prefix=$(assimulo_install_dir) ;; \
    177     *) \
    178     python setup.py install --sundials-home=$(SUNDIALS_HOME) --superlu-home=$(SUPERLU_HOME) --blas-home=$(abs_builddir)/blas_install/ --lapack-home=$(abs_builddir)/lapack_install/ --prefix=$(assimulo_install_dir) ;; \
     176    python setup.py install --with_openmp=True --superlu-home=$(abs_builddir)/superlu_build/ --sundials-home=$(SUNDIALS_HOME) --sundials-with-superlu=True --blas-home=$(abs_builddir)/blas_install/ --lapack-home=$(abs_builddir)/lapack_install/ --force-32bit="true" $(NUMPY_NO_MSVCR_ARG) --extra-c-flags="-mincoming-stack-boundary=2" --prefix=$(assimulo_install_dir) ;; \
     177    *) \
     178    python setup.py install --with_openmp=True --superlu-home=$(abs_builddir)/superlu_build/ --sundials-home=$(SUNDIALS_HOME) --sundials-with-superlu=True --blas-home=$(abs_builddir)/blas_install/ --lapack-home=$(abs_builddir)/lapack_install/ --prefix=$(assimulo_install_dir) ;; \
    179179    esac
    180180endif
    181181endif
    182182if WITH_SUNDIALS
    183 if !WITH_SUPERLU
     183if !WITH_OPENMP
    184184    mkdir -p $(assimulo_build_dir); \
    185185    cd $(abs_top_srcdir)/external; \
Note: See TracChangeset for help on using the changeset viewer.