Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/development' into 434-fast-disor…
Browse files Browse the repository at this point in the history
…ientation-calculation
  • Loading branch information
MarDiehl committed Aug 25, 2024
2 parents 26251a0 + e9afbce commit c3bfb71
Show file tree
Hide file tree
Showing 30 changed files with 2,216 additions and 482 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/Fortran.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Grid and Mesh Solver
on: [push]

env:
PETSC_VERSION: '3.21.1'
PETSC_VERSION: '3.21.4'
HOMEBREW_NO_ANALYTICS: 'ON' # Make Homebrew installation a little quicker
HOMEBREW_NO_AUTO_UPDATE: 'ON'
HOMEBREW_NO_BOTTLE_SOURCE_FALLBACK: 'ON'
Expand All @@ -13,7 +13,7 @@ jobs:

ubuntu_gcc:

runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

strategy:
matrix:
Expand All @@ -31,6 +31,7 @@ jobs:
run: |
sudo add-apt-repository ppa:ubuntu-toolchain-r/test
sudo apt-get update
sudo apt-get install liblapack-dev
sudo apt-get install -y gcc-${GCC_V} gfortran-${GCC_V} g++-${GCC_V}
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${GCC_V} 100 \
--slave /usr/bin/gfortran gfortran /usr/bin/gfortran-${GCC_V} \
Expand Down Expand Up @@ -88,7 +89,7 @@ jobs:
ubuntu_Intel:

runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

strategy:
fail-fast: false
Expand Down Expand Up @@ -126,8 +127,6 @@ jobs:
- name: PETSc - Prepare
run: |
tar -xf download/petsc-${PETSC_VERSION}.tar.gz -C .
sed -i "1800s/if not os.path.isfile(os.path.join(self.packageDir,self.configureName)):/if True:/g" \
./petsc-${PETSC_VERSION}/config/BuildSystem/config/package.py
export PETSC_DIR=${PWD}/petsc-${PETSC_VERSION}
export PETSC_ARCH=intel
printenv >> $GITHUB_ENV
Expand All @@ -146,6 +145,7 @@ jobs:
--with-fc=mpiifx \
--with-cc=mpiicx \
--with-cxx=mpiicpx \
--with-x=0 \
--download-fftw --download-hdf5 --with-hdf5-fortran-bindings=1 --download-zlib
make all
Expand Down
23 changes: 18 additions & 5 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ stages:
###################################################################################################
default:
before_script:
- ${LOCAL_HOME}/bin/queue2 ${CI_JOB_ID} ${TOKEN}
- ${LOCAL_HOME}/bin/queue ${CI_JOB_ID} ${TOKEN}
- source env/DAMASK.sh
- export PATH=${TESTROOT}/bin:${PATH}
- echo Job start:" $(date)"
Expand Down Expand Up @@ -56,7 +56,7 @@ variables:
create_testroot:
stage: prepare
before_script:
- ${LOCAL_HOME}/bin/queue2 ${CI_JOB_ID} ${TOKEN}
- ${LOCAL_HOME}/bin/queue ${CI_JOB_ID} ${TOKEN}
- echo Job start:" $(date)"
script:
- mkdir -p ${TESTROOT}
Expand All @@ -65,20 +65,33 @@ create_testroot:
###################################################################################################
setuptools:
stage: python
tags:
- matesting2-container-runner
image: git.damask-multiphysics.org:5050/damask/damask:python310_2407
before_script: []
script:
- sed -i 's/-[[:digit:]]*-.*//' VERSION
- cd python
- python3 -m build --wheel --no-isolation

pytest:
stage: python
tags:
- matesting2-container-runner
image: git.damask-multiphysics.org:5050/damask/damask:python310_2407
before_script: []
script:
- PYTHONPATH=$(pwd)/python:$PYTHONPATH
- cd python
- pytest --basetemp ${TESTROOT}/python -v --cov --damaskroot=${CI_PROJECT_DIR}
- python3 -m pytest -v --cov=damask --cov-report=xml
- coverage report --fail-under=90 --show-missing

mypy:
stage: python
tags:
- matesting2-container-runner
image: git.damask-multiphysics.org:5050/damask/damask:python310_2407
before_script: []
script:
- cd python
- mypy damask
Expand Down Expand Up @@ -243,7 +256,7 @@ grid_performance:
- make -j2 all install
- export PATH=${PWD}/bin:${PATH}
- cd $(mktemp -d)
- git clone -q [email protected].mpie.de:damask/statistics.git .
- git clone -q [email protected]-multiphysics.org:damask/statistics.git .
- ./measure_performance.py --input_dir ${CI_PROJECT_DIR}/examples/grid --tag ${CI_COMMIT_SHA}
- >
if [ ${CI_COMMIT_BRANCH} == development ]; then
Expand All @@ -269,7 +282,7 @@ update_revision:
- echo Job start:" $(date)"
script:
- cd $(mktemp -d)
- git clone -q [email protected].mpie.de:damask/DAMASK.git .
- git clone -q [email protected]-multiphysics.org:damask/DAMASK.git .
- git pull
- export VERSION=$(git describe ${CI_COMMIT_SHA})
- echo ${VERSION:1} > VERSION
Expand Down
20 changes: 20 additions & 0 deletions .gitlab/issue_templates/new_release.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
The following tasks are required for a new release.
Detailed instructions for each step are documented in the [wiki](https://git.damask.mpie.de/damask/DAMASK/-/wikis/releasing).

1. [ ] Compile changelog
1. [ ] Update repository
1. [ ] Create and upload tarball
1. [ ] Create GitLab release
1. [ ] Update examples repository
1. [ ] Update website
1. Packages
- [ ] Conda package
- [ ] Spack package
- [ ] PyPi package (wheel)
- [ ] Arch Linux (PKGBUILD)
- [ ] Ubuntu (Launchpad)
- Open build service
- [ ] Debian
- [ ] Fedora/Suse
1. [ ] Docker
1. [ ] Send info mail to mailing list
2 changes: 1 addition & 1 deletion PRIVATE
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
# DAMASK - The Düsseldorf Advanced Material Simulation Kit

- Usage, installation, and support: https://damask.mpie.de
- Code development: https://git.damask.mpie.de
- General inquiries: [email protected]
- Usage, installation, and support: https://damask-multiphysics.org
- Code development: https://git.damask-multiphysics.org
- General inquiries: [email protected]


## Repository Locations

### [git.damask.mpie.de](https://git.damask.mpie.de)

All code development is centralized in the principal DAMASK code repository hosted at [git.damask.mpie.de](https://git.damask.mpie.de).
All code development is centralized in the principal DAMASK code repository hosted at [git.damask-multiphysics.org](https://git.damask-multiphysics.org).
Access to this GitLab instance requires registration and is granted to anyone with an interest in actively supporting the development of DAMASK.

### [github.com](https://github.com/damask-multiphysics)

GitHub hosts the publicly accessible, but read-only, mirror of the principal DAMASK code repository and replicates its three top-level branches from [git.damask.mpie.de](https://git.damask.mpie.de).
GitHub hosts the publicly accessible, but read-only, mirror of the principal DAMASK code repository and replicates its most relevant branches from [git.damask-multiphysics.org](https://git.damask-multiphysics.org).

The site is primarily meant to provide a forum for [Discussions](https://github.com/damask-multiphysics/DAMASK/discussions) and [Issues](https://github.com/damask-multiphysics/DAMASK/issues).

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0.0-10-gcee66f4da
3.0.0-100-g41a50d8c8
Binary file removed img/DAMASK_QR-Code.png
Binary file not shown.
Binary file removed img/DAMASK_QR-CodeBW.png
Binary file not shown.
81 changes: 0 additions & 81 deletions img/DAMASK_QR-CodeBW.svg

This file was deleted.

Binary file added img/DAMASK_QRcode.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit c3bfb71

Please sign in to comment.