Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions examples/adh-stack.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# This profile file controls your <#> (HashDist) build environment.

# In the future, we'll provide better incorporation of
# automatic environment detection. For now, have a look
# at the YAML files in the top-level directory and choose
# the most *specific* file that matches your environment.

extends:
- file: debian.yaml

# The packages list specifies all the packages that you
# require installed. <#> will ensure that all packages
# and their dependencies are installed when you build this
# profile.

packages:
cmake:
openssl:
use: host-openssl
python:
host: false
link: shared
build_with: |
bzip2, sqlite, openssl
blas:
use: openblas
lapack:
use: openblas-lapack
mpi:
use: mpich
parmetis:
sympy:
adh:
116 changes: 0 additions & 116 deletions pkgs/adh.yaml

This file was deleted.

57 changes: 51 additions & 6 deletions pkgs/adh/adh.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,20 @@
extends: [cmake_package]

dependencies:
build: [python,mpi,parmetis,umfpack3]
build: [python,mpi,parmetis,lapack,blas]

sources:
- url: https://github.com/cekees/adh.git
key: git:ab5024c569e8bac972d706a3d354e43cce319ac3
- url: git@public.git.erdc.dren.mil:adh/adh.git
key: git:01f9fba7f6f95b77be3560cce8bfaa87f174431e

build_stages:
- name: fix_link
files:
- fix_link.patch
before: configure
handler: bash
bash: |
patch -p1 < _hashdist/fix_link.patch

- name: setup_builddir
after: prologue
Expand All @@ -29,7 +36,7 @@ build_stages:
'-DPARMETIS_INCLUDE_DIR:PATH=${PARMETIS_DIR}/include',
'-DPARMETIS_LIBRARY:FILEPATH=${PARMETIS_DIR}/lib/libparmetis.dylib',
'-DMETIS_LIBRARY=${PARMETIS_DIR}/lib/libmetis.dylib',
'-DPACKAGE_UMFPACK:BOOL=True',
'-DPACKAGE_UMFPACK:BOOL=False',
'-DUMFPACK_INCLUDE_DIR:PATH=${UMFPACK_INCLUDE}',
'-DUMFPACK_VERSION:STRING=3',
'-DUMFPACK_INT_SIZE:STRING=32',
Expand All @@ -42,14 +49,52 @@ build_stages:
extra: [
'-DCMAKE_C_COMPILER:FILEPATH=${MPICC}',
'-DCMAKE_CXX_COMPILER:FILEPATH=${MPICXX}',
'-DCMAKE_INSTALL_PREFIX:PATH=${ARTIFACT}',
'-DCMAKE_VERBOSE_MAKEFILE:BOOL=True',
'-DCMAKE_EXE_LINKER_FLAGS:STRING="-L${PARMETIS_DIR}/lib -Wl,-rpath=${PARMETIS_DIR}/lib -L${OPENBLAS_DIR}/lib -lm -Wl,-rpath=${OPENBLAS_DIR}/lib"',
'-DUSE_MPI:BOOL=ON',
'-DPACKAGE_MPI:BOOL=ON',
'-DUSE_BLAS:BOOL=ON',
'-DUSE_LAPACK:BOOL=ON',
'-DBLAS_openblas_LIBRARY:FILEPATH=${OPENBLAS_DIR}/lib/libopenblas.so',
'-DUSE_PARMETIS:BOOL=ON',
'-DPACKAGE_PARMETIS:BOOL=ON',
'-DPARMETIS_INCLUDE_DIR:PATH=${PARMETIS_DIR}/include',
'-DPARMETIS_LIBRARY:FILEPATH=${PARMETIS_DIR}/lib/libparmetis.so',
'-DMETIS_LIBRARY=${PARMETIS_DIR}/lib/libmetis.so',
'-DUSE_SUPER_LIBRARY:BOOL=False',
'-DPACKAGE_UMFPACK:BOOL=False',
'-DUMFPACK_INCLUDE_DIR:PATH=${UMFPACK_INCLUDE}',
'-DUMFPACK_VERSION:STRING=3',
'-DUMFPACK_INT_SIZE:STRING=32',
'-DUMFPACK_LIBRARY:FILEPATH=${UMFPACK_LIBRARY}'
]

- when: machine == 'CrayXE6'
name: configure
mode: override
extra: [
'-DCMAKE_C_COMPILER:FILEPATH=${MPICC}',
'-DCMAKE_C_FLAGS:STRING="-fPIC"',
'-DCMAKE_C_FLAGS_DEBUG:STRING="-g -fPIC"',
'-DCMAKE_C_FLAGS_OPT:STRING="-03 -fPIC"',
'-DCMAKE_C_FLAGS_RELEASE:STRING="-O3 -fPIC"',
'-DCMAKE_CXX_COMPILER:FILEPATH=${MPICXX}',
'-DCMAKE_CXX_FLAGS:STRING="-fPIC"',
'-DCMAKE_CXX_FLAGS_DEBUG:STRING="-g -fPIC"',
'-DCMAKE_CXX_FLAGS_RELEASE:STRING="-O3 -fPIC"',
'-DCMAKE_Fortran_COMPILER:FILEPATH=${MPIF90}',
'-DCMAKE_Fortran_FLAGS:STRING="-fPIC"',
'-DCMAKE_Fortran_FLAGS_DEBUG:STRING="-g -fPIC"',
'-DCMAKE_Fortran_FLAGS_RELEASE:STRING="-O3 -fPIC"',
'-DCMAKE_INSTALL_PREFIX:PATH=${ARTIFACT}',
'-DCMAKE_EXE_LINKER_FLAGS:STRING="-static"',
'-DPACKAGE_MPI:BOOL=True',
'-DPACKAGE_PARMETIS:BOOL=True',
'-DPARMETIS_INCLUDE_DIR:PATH=${PARMETIS_DIR}/include',
'-DPARMETIS_LIBRARY:FILEPATH=${PARMETIS_DIR}/lib/libparmetis.so',
'-DMETIS_LIBRARY=${PARMETIS_DIR}/lib/libmetis.so',
'-DPACKAGE_UMFPACK:BOOL=True',
'-DPACKAGE_UMFPACK:BOOL=False',
'-DUMFPACK_INCLUDE_DIR:PATH=${UMFPACK_INCLUDE}',
'-DUMFPACK_VERSION:STRING=3',
'-DUMFPACK_INT_SIZE:STRING=32',
Expand All @@ -67,7 +112,7 @@ build_stages:
'-DCMAKE_INSTALL_PREFIX:PATH=${ARTIFACT}',
'-DPACKAGE_MPI:BOOL=True',
'-DPACKAGE_PARMETIS:BOOL=False',
'-DPACKAGE_UMFPACK:BOOL=True',
'-DPACKAGE_UMFPACK:BOOL=False',
'-DUMFPACK_INCLUDE_DIR:PATH=${UMFPACK_INCLUDE}',
'-DUMFPACK_VERSION:STRING=3',
'-DUMFPACK_INT_SIZE:STRING=32',
Expand Down
121 changes: 0 additions & 121 deletions pkgs/adh/configure-linux.py

This file was deleted.

12 changes: 12 additions & 0 deletions pkgs/adh/fix_link.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt
index d6224e4..0d45b9d 100644
--- a/main/CMakeLists.txt
+++ b/main/CMakeLists.txt
@@ -81,6 +81,7 @@ add_executable(adh ${adh_sources})
set(CMAKE_C_IMPLICIT_LINK_LIBRARIES "")
endif(USE_NSM)

+ target_link_libraries(adh m)

##############################################################################

Loading