diff --git a/Makefile b/Makefile index 3ac9c4a..8152e81 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ all: - DOCKER_BUILDKIT=1 docker build --shm-size=4gb --secret id=user,src=.secret/user --secret id=token,src=.secret/token -t git.broccolimicro.io/broccoli/development-environment:latest . + DOCKER_BUILDKIT=1 docker build --shm-size=4gb --secret id=user,src=.secret/user --secret id=token,src=.secret/token -t git.broccolimicro.io/broccoli/broccoli-cli:latest . local: - DOCKER_BUILDKIT=1 docker build --shm-size=4gb --secret id=user,src=.secret/user --secret id=token,src=.secret/token -t git.broccolimicro.io/broccoli/development-environment:latest --add-host=git.broccolimicro.io:10.0.0.65 . + DOCKER_BUILDKIT=1 docker build --shm-size=4gb --secret id=user,src=.secret/user --secret id=token,src=.secret/token -t git.broccolimicro.io/broccoli/broccoli-cli:latest --add-host=git.broccolimicro.io:10.0.0.65 . diff --git a/VERSION b/VERSION index 6e8bf73..0c62199 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.1.0 +0.2.1 diff --git a/bcli-develop.sh b/bcli-develop.sh index aba703e..8644b0d 100644 --- a/bcli-develop.sh +++ b/bcli-develop.sh @@ -1,6 +1,6 @@ bcli() { if [ "$1" = "up" ]; then - docker run -d -v $HOME:/host --rm --name "bcli-develop" -h "bcli-develop" -e USER=$USER -e USER_ID=$(id -u) -e GROUP_ID=$(id -g) -e DISPLAY=$DISPLAY -v "/tmp/.X11-unix:/tmp/.X11-unix:rw" git.broccolimicro.io/broccoli/development-environment:latest > /dev/null + docker run -d -v $HOME:/host --rm --name "bcli-develop" -h "bcli-develop" -e USER=$USER -e USER_ID=$(id -u) -e GROUP_ID=$(id -g) -e DISPLAY=$DISPLAY -v "/tmp/.X11-unix:/tmp/.X11-unix:rw" git.broccolimicro.io/broccoli/broccoli-cli:latest > /dev/null echo "bcli-develop started" elif [ "$1" = "down" ]; then docker stop bcli-develop > /dev/null diff --git a/trilinos/reconfigure b/trilinos/reconfigure deleted file mode 100755 index 207f52d..0000000 --- a/trilinos/reconfigure +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh -SRCDIR=/toolsrc/Trilinos -ARCHDIR=/opt/trilinos -FLAGS="-O3 -fPIC" -cmake \ --G "Unix Makefiles" \ --DCMAKE_C_COMPILER=mpicc \ --DCMAKE_CXX_COMPILER=mpic++ \ --DCMAKE_Fortran_COMPILER=mpif77 \ --DCMAKE_CXX_FLAGS="$FLAGS" \ --DCMAKE_C_FLAGS="$FLAGS" \ --DCMAKE_Fortran_FLAGS="$FLAGS" \ --DCMAKE_INSTALL_PREFIX=$ARCHDIR \ --DCMAKE_MAKE_PROGRAM="make" \ --DTrilinos_ENABLE_NOX=ON \ - -DNOX_ENABLE_LOCA=ON \ --DTrilinos_ENABLE_EpetraExt=ON \ - -DEpetraExt_BUILD_BTF=ON \ - -DEpetraExt_BUILD_EXPERIMENTAL=ON \ - -DEpetraExt_BUILD_GRAPH_REORDERINGS=ON \ --DTrilinos_ENABLE_TrilinosCouplings=ON \ --DTrilinos_ENABLE_Ifpack=ON \ --DTrilinos_ENABLE_Isorropia=ON \ --DTrilinos_ENABLE_AztecOO=ON \ --DTrilinos_ENABLE_Belos=ON \ --DTrilinos_ENABLE_Teuchos=ON \ --DTrilinos_ENABLE_COMPLEX_DOUBLE=ON \ --DTrilinos_ENABLE_Amesos=ON \ - -DAmesos_ENABLE_KLU=ON \ --DTrilinos_ENABLE_Amesos2=ON \ - -DAmesos2_ENABLE_KLU2=ON \ - -DAmesos2_ENABLE_Basker=ON \ --DTrilinos_ENABLE_Sacado=ON \ --DTrilinos_ENABLE_Stokhos=ON \ --DTrilinos_ENABLE_Kokkos=ON \ --DTrilinos_ENABLE_Zoltan=ON \ --DTrilinos_ENABLE_ALL_OPTIONAL_PACKAGES=OFF \ --DTrilinos_ENABLE_CXX11=ON \ --DTPL_ENABLE_AMD=ON \ --DAMD_LIBRARY_DIRS="/usr/lib" \ --DTPL_AMD_INCLUDE_DIRS="/usr/include/suitesparse" \ --DTPL_ENABLE_BLAS=ON \ --DTPL_ENABLE_LAPACK=ON \ --DTPL_ENABLE_MPI=ON \ --DMPI_BASE_DIR=/usr \ -$SRCDIR