Skip to content

Commit

Permalink
fix: ifc rel mat efficiency (#109)
Browse files Browse the repository at this point in the history
  • Loading branch information
Krande authored Sep 3, 2024
1 parent 91b7ec9 commit 3231486
Show file tree
Hide file tree
Showing 89 changed files with 866 additions and 1,670 deletions.
10 changes: 10 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
version: 2
updates:
- package-ecosystem: github-actions
directory: /
schedule:
interval: monthly # or daily, weekly
groups:
dependencies:
patterns:
- '*'
24 changes: 24 additions & 0 deletions .github/workflows/ci-code-profiling.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,14 @@ jobs:
shell: bash -el {0}
steps:
- uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha || github.ref }}

- name: Set up swap space
uses: pierotofy/set-swap-space@v1.0
with:
swap-size-gb: 10

- uses: mamba-org/setup-micromamba@v1 # https://github.com/mamba-org/setup-micromamba
with:
cache-environment: false
Expand All @@ -33,8 +41,24 @@ jobs:
ada-py
python=3.12
pytest
pytest-benchmark
pytest-codspeed
- name: Install latest version
run: |
pip install -e .
# - name: Run pytest-benchmark
# run: pytest ./tests --ignore=./tests/fem/ --ignore=./tests/full/ --benchmark-json output.json
#
# - name: Store benchmark result
# uses: benchmark-action/github-action-benchmark@v1
# with:
# tool: 'pytest'
# output-file-path: output.json
# # Enable Job Summary for PRs
# summary-always: true

- name: Run benchmarks
uses: CodSpeedHQ/action@v3
with:
Expand Down
14 changes: 8 additions & 6 deletions .github/workflows/pr-tests.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
name: Pull Request Tests

on:
pull_request_target:
types: [ opened, synchronize, edited, unlabeled ]
pull_request:
branches:
- main
- develop

# Use concurrency to ensure that only one instance of this workflow is running at a time
concurrency:
group: pr-tests--${{ github.sha }}
group: pr-tests-${{ github.ref_name }}
cancel-in-progress: true

# installs mamba-org/setup-micromamba@v1 on all 3 platforms using matrix and runs pytest:
Expand All @@ -18,8 +16,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha || github.ref }}

- uses: prefix-dev/setup-pixi@v0.8.0
- uses: prefix-dev/setup-pixi@v0.8.1 # https://github.com/prefix-dev/setup-pixi
with:
pixi-version: v0.28.2
cache: true
Expand All @@ -37,6 +37,8 @@ jobs:
os: [ubuntu-latest, windows-latest, macos-13]
steps:
- uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha || github.ref }}

- uses: mamba-org/setup-micromamba@v1 # https://github.com/mamba-org/setup-micromamba
with:
Expand All @@ -54,4 +56,4 @@ jobs:
pip install -e .
- name: Runs Tests
run: pytest ./tests --ignore=./tests/fem/ --ignore=./tests/full/ --ignore=./tests/profiling/
run: pytest ./tests --ignore=./tests/fem/ --ignore=./tests/full/ --ignore=./tests/profiling/ --durations=0
7 changes: 5 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@ jobs:
run:
shell: bash -l {0}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha || github.ref }}

- uses: mamba-org/setup-micromamba@v1 # https://github.com/mamba-org/setup-micromamba
with:
cache-environment: false
Expand Down Expand Up @@ -64,4 +67,4 @@ jobs:
pip install -e .
- name: Run Tests
run: pytest ./tests --ignore=./tests/fem/ --ignore=./tests/profiling/
run: pytest ./tests --ignore=./tests/fem/ --ignore=./tests/profiling/ --durations=0
11 changes: 4 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# ADA - Assembly for Design & Analysis

[![Anaconda-Server Badge](https://anaconda.org/krande/ada-py/badges/version.svg)](https://anaconda.org/krande/ada-py)
[![Anaconda-Server Badge](https://anaconda.org/krande/ada-py/badges/latest_release_date.svg)](https://anaconda.org/krande/ada-py)
[![Anaconda-Server Badge](https://anaconda.org/krande/ada-py/badges/platforms.svg)](https://anaconda.org/krande/ada-py)
[![Anaconda-Server Badge](https://anaconda.org/krande/ada-py/badges/downloads.svg)](https://anaconda.org/krande/ada-py)
[![Anaconda-Server Badge](https://anaconda.org/conda-forge/ada-py/badges/version.svg)](https://anaconda.org/conda-forge/ada-py)
[![Anaconda-Server Badge](https://anaconda.org/conda-forge/ada-py/badges/latest_release_date.svg)](https://anaconda.org/krande/ada-py)
[![Anaconda-Server Badge](https://anaconda.org/conda-forge/ada-py/badges/platforms.svg)](https://anaconda.org/conda-forge/ada-py)
[![Anaconda-Server Badge](https://anaconda.org/conda-forge/ada-py/badges/downloads.svg)](https://anaconda.org/conda-forge/ada-py)
[![PyPi Badge](https://img.shields.io/pypi/v/ada-py)](https://pypi.org/project/ada-py/)

A python library for working with structural analysis and design. This library should be considered as experimental.
Expand Down Expand Up @@ -156,9 +156,6 @@ For installation files of open source FEM software such as Calculix and Code Ast
* https://prepomax.fs.um.si/downloads/ (PreProMax -> Calculix preprocessor)


**Note!** pip is not a recommended installation method due to an unstable behaviour often
manifested as DLL import errors related to the vtk package.

## Acknowledgements

This project would never have been possible without the existing open source python and c++ libraries.
Expand Down
2 changes: 1 addition & 1 deletion action_config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ recipe_dir = "./conda"
extra_conda_dep_channels = ["krande"]
platforms = "ubuntu-latest,windows-latest,macos-latest"
# Anaconda Related
use_anaconda_server = true
use_anaconda_server = false
owner = "Krande"
label = "main"
#
Expand Down
Loading

0 comments on commit 3231486

Please sign in to comment.