Changeset 13909


Ignore:
Timestamp:
Oct 30, 2019 12:49:34 PM (2 weeks ago)
Author:
randersson
Message:

#5819 Reverted r13092-r13095 because it seems that number of make processes escalates

Location:
branches/dev-5819
Files:
11 edited

Legend:

Unmodified
Added
Removed
  • branches/dev-5819/Makefile.am

    r13905 r13909  
    6767if PYTHON_ENABLED
    6868if WITH_OPENMP
     69    mkdir -p $(assimulo_build_dir); \
    6970    cd $(assimulo_src_dir)/../build_externals/build/assimulo; \
    7071    case $(build) in \
    7172    *-cygwin*) \
    72     ASSIMULO_USER_CONFIG=../../configurations/Assimulo/windows/win32_cygwin_py2;; \
     73    make install USER_CONFIG=../../configurations/Assimulo/windows/win32_cygwin_py2 JM_HOME=$(abs_top_srcdir) BUILD_DIR=$(abs_builddir);; \
    7374    *-mingw*) \
    74     ASSIMULO_USER_CONFIG=../../configurations/Assimulo/windows/$(ASSIMULO_CONFIG);; \
     75    make install USER_CONFIG=../../configurations/Assimulo/windows/$(ASSIMULO_CONFIG) JM_HOME=$(abs_top_srcdir) BUILD_DIR=$(abs_builddir) ;; \
    7576    *) \
    76     ASSIMULO_USER_CONFIG=../../configurations/Assimulo/unix/config;; \
     77    make install USER_CONFIG=../../configurations/Assimulo/unix/config JM_HOME=$(abs_top_srcdir) BUILD_DIR=$(abs_builddir);; \
    7778    esac
    78     make install USER_CONFIG=$(ASSIMULO_USER_CONFIG) JM_HOME=$(abs_top_srcdir) BUILD_DIR=$(abs_builddir)
    7979if JM_WIN64
    8080if WITH_PYTHON64
  • branches/dev-5819/Makefile.in

    r13904 r13909  
    10771077@PYTHON_ENABLED_TRUE@@WITH_OPENMP_TRUE@ case $(build) in \
    10781078@PYTHON_ENABLED_TRUE@@WITH_OPENMP_TRUE@ *-cygwin*) \
    1079 @PYTHON_ENABLED_TRUE@@WITH_OPENMP_TRUE@ ASSIMULO_USER_CONFIG=../../configurations/Assimulo/windows/win32_cygwin_py2;; \
     1079@PYTHON_ENABLED_TRUE@@WITH_OPENMP_TRUE@ make install USER_CONFIG=../../configurations/Assimulo/windows/win32_cygwin_py2 JM_HOME=$(abs_top_srcdir) BUILD_DIR=$(abs_builddir);; \
    10801080@PYTHON_ENABLED_TRUE@@WITH_OPENMP_TRUE@ *-mingw*) \
    1081 @PYTHON_ENABLED_TRUE@@WITH_OPENMP_TRUE@ ASSIMULO_USER_CONFIG=../../configurations/Assimulo/windows/$(ASSIMULO_CONFIG);; \
     1081@PYTHON_ENABLED_TRUE@@WITH_OPENMP_TRUE@ make install USER_CONFIG=../../configurations/Assimulo/windows/$(ASSIMULO_CONFIG) JM_HOME=$(abs_top_srcdir) BUILD_DIR=$(abs_builddir) ;; \
    10821082@PYTHON_ENABLED_TRUE@@WITH_OPENMP_TRUE@ *) \
    1083 @PYTHON_ENABLED_TRUE@@WITH_OPENMP_TRUE@ ASSIMULO_USER_CONFIG=../../configurations/Assimulo/unix/config;; \
     1083@PYTHON_ENABLED_TRUE@@WITH_OPENMP_TRUE@ make install USER_CONFIG=../../configurations/Assimulo/unix/config JM_HOME=$(abs_top_srcdir) BUILD_DIR=$(abs_builddir);; \
    10841084@PYTHON_ENABLED_TRUE@@WITH_OPENMP_TRUE@ esac
    1085 @PYTHON_ENABLED_TRUE@@WITH_OPENMP_TRUE@ make install USER_CONFIG=$(ASSIMULO_USER_CONFIG) JM_HOME=$(abs_top_srcdir) BUILD_DIR=$(abs_builddir)
    10861085@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@@WITH_OPENMP_TRUE@@WITH_PYTHON64_TRUE@  mkdir -p $(assimulo_build_dir64); \
    10871086@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@@WITH_OPENMP_TRUE@@WITH_PYTHON64_TRUE@  cd $(assimulo_src_dir)/..; \
  • branches/dev-5819/external/build_externals/configurations/Assimulo/unix/config

    r13902 r13909  
     1-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)
     2
    13BITNESS=64
    24FORCE_32_BIT=false
  • branches/dev-5819/external/build_externals/configurations/Assimulo/windows/win32

    r13902 r13909  
    1717#   <http://www.ibm.com/developerworks/library/os-cpl.html/> respectively.
    1818
    19 # mkfile_path is the path to this file
    2019mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
    2120mkfile_dir := $(dir $(mkfile_path))
    2221include $(mkfile_dir)/win
    23 
    2422BITNESS=32
    2523EXTRA_SETUP_ARGS=--with_openmp=True --no-msvcr=true --force-32bit=true --extra-c-flags=-mincoming-stack-boundary=2
  • branches/dev-5819/external/build_externals/configurations/Assimulo/windows/win32_cygwin_py2

    r13902 r13909  
    1717#   <http://www.ibm.com/developerworks/library/os-cpl.html/> respectively.
    1818
    19 # mkfile_path is the path to this file
    2019mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
    2120mkfile_dir := $(dir $(mkfile_path))
    2221include $(mkfile_dir)/win
    23 
    2422BITNESS=32
    2523EXTRA_SETUP_ARGS=--with_openmp=True --force-32bit=true --extra-c-flags=-mincoming-stack-boundary=2
  • branches/dev-5819/external/build_externals/configurations/Assimulo/windows/win32_msys_py2

    r13902 r13909  
    1717#   <http://www.ibm.com/developerworks/library/os-cpl.html/> respectively.
    1818
    19 # mkfile_path is the path to this file
    2019mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
    2120mkfile_dir := $(dir $(mkfile_path))
    2221include $(mkfile_dir)/win
    23 
    2422BITNESS=32
    2523EXTRA_SETUP_ARGS=--with_openmp=True --no-msvcr=true --force-32bit=true --extra-c-flags=-mincoming-stack-boundary=2
  • branches/dev-5819/external/build_externals/configurations/Assimulo/windows/win64

    r13902 r13909  
    1717#   <http://www.ibm.com/developerworks/library/os-cpl.html/> respectively.
    1818
    19 # mkfile_path is the path to this file
    2019mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
    2120mkfile_dir := $(dir $(mkfile_path))
    2221include $(mkfile_dir)/win
    23 
    2422BITNESS=64
    2523FORCE_32_BIT=false
  • branches/dev-5819/external/build_externals/configurations/Assimulo/windows/win64_msys_py2

    r13902 r13909  
    1717#   <http://www.ibm.com/developerworks/library/os-cpl.html/> respectively.
    1818
    19 # mkfile_path is the path to this file
    2019mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
    2120mkfile_dir := $(dir $(mkfile_path))
    2221include $(mkfile_dir)/win
    23 
    2422BITNESS=64
    2523FORCE_32_BIT=false
  • branches/dev-5819/external/build_externals/configurations/Assimulo/windows/win64_msys_py3

    r13902 r13909  
    1717#   <http://www.ibm.com/developerworks/library/os-cpl.html/> respectively.
    1818
    19 
    20 # mkfile_path is the path to this file
    2119mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
    2220mkfile_dir := $(dir $(mkfile_path))
    2321include $(mkfile_dir)/win
    24 
    25 BITNESS:=64
    26 EXTRA_SETUP_ARGS:=--with_openmp=True
     22BITNESS=64
     23EXTRA_SETUP_ARGS=--with_openmp=True
    2724
    2825SUPERLU_HOME=$(BUILD_DIR)/superlu_build$(BITNESS)
  • branches/dev-5819/external/build_externals/configurations/Assimulo/windows/win64py3

    r13902 r13909  
    1717#   <http://www.ibm.com/developerworks/library/os-cpl.html/> respectively.
    1818
    19 # mkfile_path is the path to this file
    2019mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
    2120mkfile_dir := $(dir $(mkfile_path))
    2221include $(mkfile_dir)/win
    23 
    2422BITNESS=64
    2523FORCE_32_BIT=false
    26 EXTRA_SETUP_ARGS=--with_openmp=True
     24EXTRA_SETUP_ARGS=--with_openmp=True 
    2725
    28 SUPERLU_HOME=$(BUILD_DIR)/superlu_install64msvs
    29 SUNDIALS_HOME=$(BUILD_DIR)/sundials_install64msvs
    30 BLAS_HOME=
    31 LAPACK_HOME=
    32 MKL_HOME=
     26SUPERLU_HOME=$(BUILD_DIR)/superlu_install64
     27SUNDIALS_HOME=$(BUILD_DIR)/sundials_install64
     28BLAS_HOME=$(BUILD_DIR)/blas_install64
     29LAPACK_HOME=$(BUILD_DIR)/lapack_install64
    3330INSTALL_DIR_FOLDER=${WORKSPACE}/install/Python
    3431
  • branches/dev-5819/jm_tests.in

    r13903 r13909  
    184184
    185185function python_tests() {
    186   if [ "${KEEP_PYTHON}" == 1 ]; then
    187     TEST_DIR="$(pwd)/tests_$(date "+%F_%H-%M-%S")"
    188     mkdir ${TEST_DIR}
    189   else
    190     TEST_DIR="$(pwd)/tests_tmp"
    191     mkdir ${TEST_DIR}
    192     ls -la
    193   fi
     186  TEST_DIR="$(pwd)/tests_$(date "+%F_%H-%M-%S")"
     187  mkdir ${TEST_DIR}
    194188  print_name Python
    195189  res=0
Note: See TracChangeset for help on using the changeset viewer.