Skip to content

Commit 28371c7

Browse files
author
german
committed
Bump to 0.68.1
Merge branch 'main' into release/0.68
2 parents 3d66316 + 5964386 commit 28371c7

File tree

172 files changed

+4834
-2602
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

172 files changed

+4834
-2602
lines changed

.ci/collect_mapdl_logs.sh

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
#!/bin/bash
2+
if [[ $MAPDL_VERSION == *"ubuntu"* ]] ; then
3+
echo "It is an ubuntu based image"
4+
export FILE=/jobs/file
5+
export WDIR='/jobs/'
6+
7+
else
8+
echo "It is a CentOS based image"
9+
export FILE=file
10+
export WDIR=""
11+
12+
fi;
13+
14+
15+
mkdir "$LOG_NAMES" && echo "Successfully generated directory $LOG_NAMES"
16+
17+
####
18+
echo "Collecting MAPDL logs..."
19+
20+
(docker exec "$MAPDL_INSTANCE" /bin/bash -c "mkdir -p /mapdl_logs && echo 'Successfully created directory inside docker container'") || echo "Failed to create a directory inside docker container for logs."
21+
(docker exec "$MAPDL_INSTANCE" /bin/bash -c "if compgen -G '$FILE*.out' > /dev/null ;then cp -f /file*.out /mapdl_logs && echo 'Successfully copied out files.'; fi") || echo "Failed to copy the 'out' files into a local file"
22+
(docker exec "$MAPDL_INSTANCE" /bin/bash -c "if compgen -G '$FILE*.err' > /dev/null ;then cp -f /file*.err /mapdl_logs && echo 'Successfully copied err files.'; fi") || echo "Failed to copy the 'err' files into a local file"
23+
(docker exec "$MAPDL_INSTANCE" /bin/bash -c "if compgen -G '$FILE*.log' > /dev/null ;then cp -f /file*.log /mapdl_logs && echo 'Successfully copied log files.'; fi") || echo "Failed to copy the 'log' files into a local file"
24+
(docker exec "$MAPDL_INSTANCE" /bin/bash -c "if compgen -G '$WDIR*.crash' > /dev/null ;then cp -f /*.crash /mapdl_logs && echo 'Successfully copied crash files.'; fi") || echo "Failed to copy the 'crash' files into a local file"
25+
26+
docker cp "$MAPDL_INSTANCE":/mapdl_logs/. ./"$LOG_NAMES"/. || echo "Failed to copy the 'log-build-docs' files into a local directory"
27+
28+
####
29+
echo "Collecting local build logs..."
30+
31+
echo "Collecting docker run log..."
32+
cp log.txt ./"$LOG_NAMES"/log.txt || echo "MAPDL run docker log not found."
33+
34+
echo "Copying docker launch log..."
35+
cp mapdl_launch_0.log ./"$LOG_NAMES"/mapdl_launch_0.log || echo "MAPDL launch docker log not found."
36+
cp mapdl_launch_1.log ./"$LOG_NAMES"/mapdl_launch_1.log || echo "MAPDL launch docker log not found."
37+
38+
echo "Collecting file structure..."
39+
ls -R > ./"$LOG_NAMES"/files_structure.txt || echo "Failed to copy file structure to a file"
40+
41+
echo "Collecting docker file structure..."
42+
docker exec "$MAPDL_INSTANCE" /bin/bash -c "ls -R" > ./"$LOG_NAMES"/docker_files_structure.txt || echo "Failed to copy the docker structure into a local file"
43+
44+
echo "Tar files..."
45+
tar cvzf ./"$LOG_NAMES".tgz ./"$LOG_NAMES" || echo "Failed to compress"

.ci/display_logs.sh

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
#!/bin/bash
2+
3+
echo "::group:: Display files structure" && ls -R && echo "::endgroup::"
4+
5+
6+
echo "::group:: Display files structure" && docker exec "$MAPDL_INSTANCE" /bin/bash -c "ls -R" && echo "::endgroup::" || echo "Failed to display the docker structure."
7+
8+
9+
echo "::group:: Display docker run log" && cat log.txt && echo "::endgroup::"
10+
11+
# Displaying MAPDL files
12+
FILE_PAT=./"$LOG_NAMES"/*.err
13+
if compgen -G "$FILE_PAT" > /dev/null ;then for f in "$FILE_PAT"; do echo "::group:: Error file $f" && cat "$f" && echo "::endgroup::" ; done; fi || echo "Failed to display the 'out' files."
14+
15+
FILE_PAT=./"$LOG_NAMES"/*.log
16+
if compgen -G "$FILE_PAT" > /dev/null ;then for f in "$FILE_PAT"; do echo "::group:: Log file $f" && cat "$f" && echo "::endgroup::" ; done; fi || echo "Failed to display the 'err' files."
17+
18+
FILE_PAT=./"$LOG_NAMES"/*.out
19+
if compgen -G "$FILE_PAT" > /dev/null ;then for f in "$FILE_PAT"; do echo "::group:: Output file $f" && cat "$f" && echo "::endgroup::" ; done; fi || echo "Failed to display the 'log' files."
20+

.ci/start_mapdl.sh

+41-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,40 @@
11
#!/bin/bash
2+
echo "MAPDL Instance name: $INSTANCE_NAME"
3+
echo "MAPDL_VERSION: $MAPDL_VERSION"
4+
5+
export MAPDL_IMAGE="$MAPDL_PACKAGE:$MAPDL_VERSION"
6+
echo "MAPDL_IMAGE: $MAPDL_IMAGE"
27
docker pull "$MAPDL_IMAGE"
8+
9+
export MAJOR=$(echo "$MAPDL_VERSION" | head -c 3 | tail -c 2)
10+
export MINOR=$(echo "$MAPDL_VERSION" | head -c 5 | tail -c 1)
11+
12+
export VERSION="$MAJOR$MINOR"
13+
echo "MAPDL VERSION: $VERSION"
14+
15+
16+
if [[ $MAPDL_VERSION == *"latest-ubuntu"* ]]; then
17+
echo "It is latest-ubuntu. Using 'ansys' script to launch"
18+
export EXEC_PATH=ansys
19+
# export P_SCHEMA=/ansys_inc/ansys/ac4/schema
20+
21+
elif [[ $MAPDL_VERSION == *"ubuntu"* ]] ; then
22+
echo "It is an ubuntu based image"
23+
export EXEC_PATH=/ansys_inc/v$VERSION/ansys/bin/mapdl
24+
export P_SCHEMA=/ansys_inc/v$VERSION/ansys/ac4/schema
25+
26+
else
27+
echo "It is a CentOS based image"
28+
export EXEC_PATH=/ansys_inc/ansys/bin/mapdl
29+
export P_SCHEMA=/ansys_inc/ansys/ac4/schema
30+
fi;
31+
32+
echo "EXEC_PATH: $EXEC_PATH"
33+
echo "P_SCHEMA: $P_SCHEMA"
34+
335
docker run \
4-
--name mapdl \
36+
--entrypoint "/bin/bash" \
37+
--name "$INSTANCE_NAME" \
538
--restart always \
639
--health-cmd="ps aux | grep \"[/]ansys_inc/.*ansys\.e.*grpc\" -q && echo 0 || echo 1" \
740
--health-interval=0.5s \
@@ -12,12 +45,13 @@ docker run \
1245
-e ANSYS_LOCK="OFF" \
1346
-p "$PYMAPDL_PORT":50052 \
1447
-p "$PYMAPDL_DB_PORT":50055 \
15-
--shm-size=1gb \
48+
--shm-size=2gb \
1649
-e I_MPI_SHM_LMT=shm \
17-
-e P_SCHEMA=/ansys_inc/ansys/ac4/schema \
18-
--oom-kill-disable \
19-
--memory=6656MB \
50+
-e P_SCHEMA="$P_SCHEMA" \
51+
-w /jobs \
52+
-u=0:0 \
53+
--memory=6656MB \
2054
--memory-swap=16896MB \
21-
"$MAPDL_IMAGE" \
22-
-"$DISTRIBUTED_MODE" -np 2 > log.txt &
55+
"$MAPDL_IMAGE" "$EXEC_PATH" -grpc -dir /jobs -"$DISTRIBUTED_MODE" -np 2 > log.txt &
56+
2357
grep -q 'Server listening on' <(timeout 60 tail -f log.txt)

.ci/start_mapdl_student.sh

-18
This file was deleted.

.ci/start_mapdl_ubuntu.sh

-24
This file was deleted.

.ci/substitute_defective_gif.sh

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/bash
2+
cd doc/_build/html/examples/gallery_examples/00-mapdl-examples
3+
cp ../../../../../source/images/dcb.gif ../../../_images/
4+
sed -i 's+../../../_images/sphx_glr_composite_dcb_004.gif+../../../_images/dcb.gif+g' composite_dcb.html
5+
cd ../../../../../../

.ci/waiting_services.sh

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
#!/bin/bash
2+
echo "Waiting for the MAPDL service to be up..."
3+
nc -v -z localhost "$PYMAPDL_PORT"
4+
echo "::group:: ps aux Output" && ps aux && echo "::endgroup::"
5+
6+
echo "Waiting for MAPDL port is open..."
7+
echo "::group:: Waiting for the MAPDL port to be open..."
8+
while ! nc -z localhost "$PYMAPDL_PORT"; do
9+
sleep 0.1
10+
done
11+
echo "::endgroup::"
12+
echo "MAPDL service is up!"
13+
14+
echo "::group:: Waiting for the DPF port to be open..."
15+
while ! nc -z localhost "$DPF_PORT"; do
16+
sleep 0.1
17+
done
18+
echo "::endgroup::"
19+
echo "DPF service is up!"
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
ansys-dpf-core==0.10.1
2-
autopep8==2.0.4
2+
autopep8==2.1.0
33
matplotlib==3.8.3
44
scipy==1.12.0
5-
pandas==2.2.0
5+
pandas==2.2.1
66
pyiges[full]==0.3.1
7-
pytest==8.0.1
8-
pytest-cov==4.1.0
9-
pyvista==0.43.3
7+
pytest==8.1.1
8+
pytest-cov==5.0.0
9+
pyvista==0.43.4
1010
pyansys-tools-report==0.7.0
1111
vtk==9.3.0
12-
pytest-rerunfailures==13.0
12+
pytest-rerunfailures==14.0
1313
pytest-pyvista==0.1.9
14-
pytest-timeout==2.2.0
14+
pytest-timeout==2.3.1

.devcontainer/codespaces-docs/requirements.txt

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
sphinx==7.2.6
22
ansys-dpf-core==0.10.1
33
ansys-mapdl-reader==0.53.0
4-
ansys-sphinx-theme==0.14.0
5-
grpcio==1.62.0
4+
ansys-sphinx-theme==0.14.1
5+
grpcio==1.62.1
66
imageio-ffmpeg==0.4.9
77
imageio==2.34.0
88
jupyter_sphinx==0.5.3
99
jupyterlab>=3.2.8
1010
matplotlib==3.8.3
11-
numpydoc==1.6.0
12-
pandas==2.2.0
13-
plotly==5.19.0
11+
numpydoc==1.7.0
12+
pandas==2.2.1
13+
plotly==5.20.0
1414
pyiges[full]==0.3.1
1515
pypandoc==1.13
1616
pytest-sphinx==0.6.0
1717
pythreejs==2.4.2
18-
pyvista[trame]==0.43.3
18+
pyvista[trame]==0.43.4
1919
sphinx-autobuild==2024.2.4
2020
sphinx-autodoc-typehints==1.25.2
2121
sphinx-copybutton==0.5.2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
ansys-dpf-core==0.10.1
2-
autopep8==2.0.4
2+
autopep8==2.1.0
33
matplotlib==3.8.3
44
scipy==1.12.0
5-
pandas==2.2.0
5+
pandas==2.2.1
66
pyiges[full]==0.3.1
7-
pytest==8.0.1
8-
pytest-cov==4.1.0
9-
pyvista==0.43.3
7+
pytest==8.1.1
8+
pytest-cov==5.0.0
9+
pyvista==0.43.4
1010
pyansys-tools-report==0.7.0
1111
vtk==9.3.0
12-
pytest-rerunfailures==13.0
12+
pytest-rerunfailures==14.0
1313
pytest-pyvista==0.1.9
14-
pytest-timeout==2.2.0
14+
pytest-timeout==2.3.1

.github/workflows/cache_cleaner.yml

+16-5
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Check out code
13-
uses: actions/checkout@v4
13+
uses: actions/checkout@v4.1.2
1414

1515
- name: Cleanup PR caches
1616
if: github.event_name != 'workflow_dispatch'
@@ -26,9 +26,15 @@ jobs:
2626
## Setting this to not fail the workflow while deleting cache keys.
2727
set +e
2828
echo "Deleting caches..."
29-
for cacheKey in $cacheKeysForPR
29+
30+
while [ ! -z "$cacheKeysForPR" ];
3031
do
31-
gh actions-cache delete $cacheKey -R $REPO -B $BRANCH --confirm && echo "Deleting cache with key: $cacheKey"
32+
for cacheKey in $cacheKeysForPR
33+
do
34+
gh actions-cache delete $cacheKey -R $REPO -B $BRANCH --confirm && echo "Deleting cache with key: $cacheKey"
35+
done
36+
37+
cacheKeysForPR=$(gh actions-cache list -R $REPO -B $BRANCH | cut -f 1 )
3238
done
3339
echo "Done"
3440
env:
@@ -48,9 +54,14 @@ jobs:
4854
## Setting this to not fail the workflow while deleting cache keys.
4955
set +e
5056
echo "Deleting caches..."
51-
for cacheKey in $cacheKeysForPR
57+
while [ ! -z "$cacheKeysForPR" ];
5258
do
53-
gh actions-cache delete $cacheKey -R $REPO --confirm && echo "Deleting cache with key: $cacheKey"
59+
for cacheKey in $cacheKeysForPR
60+
do
61+
gh actions-cache delete $cacheKey -R $REPO --confirm && echo "Deleting cache with key: $cacheKey"
62+
done
63+
64+
cacheKeysForPR=$(gh actions-cache list -R $REPO | cut -f 1 )
5465
done
5566
echo "Done"
5667
env:

0 commit comments

Comments
 (0)