Skip to content

Commit 28cd6f4

Browse files
TheAssembler1TheAssembler1
committed
merge with develop, many errors now...
2 parents a4c7458 + 797833d commit 28cd6f4

File tree

362 files changed

+20856
-26779
lines changed

Some content is hidden

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

362 files changed

+20856
-26779
lines changed

‎.github/workflows/dependencies-macos.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22

33
set -eu -o pipefail
44

5-
export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=FALSE
6-
7-
brew install open-mpi automake
5+
brew install open-mpi automake m4 libtool
86

97
# libfabric
108
wget https://github.com/ofiwg/libfabric/archive/refs/tags/v1.15.2.tar.gz

‎.github/workflows/gitlab-develop.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: GitLab
2+
3+
on:
4+
push:
5+
branches:
6+
- develop
7+
8+
jobs:
9+
sync-with-gitlab:
10+
runs-on: ubuntu-latest
11+
timeout-minutes: 2
12+
13+
steps:
14+
- uses: actions/checkout@v3
15+
with:
16+
fetch-depth: 0
17+
18+
- name: Setup git
19+
run: |
20+
git config --global user.name "PDC BOT"
21+
git config --global user.email "[email protected]"
22+
23+
- name: Update branch
24+
run: |
25+
git fetch origin develop
26+
git remote add gitlab https://${{ secrets.GITLAB_TOKEN_NAME }}:${{ secrets.GITLAB_TOKEN }}@${{ secrets.GITLAB_URL }}
27+
git checkout develop
28+
git push -f gitlab -u develop

‎.github/workflows/gitlab-stable.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: GitLab
2+
3+
on:
4+
push:
5+
branches:
6+
- stable
7+
8+
jobs:
9+
sync-with-gitlab:
10+
runs-on: ubuntu-latest
11+
timeout-minutes: 2
12+
13+
steps:
14+
- uses: actions/checkout@v3
15+
with:
16+
fetch-depth: 0
17+
18+
- name: Setup git
19+
run: |
20+
git config --global user.name "PDC BOT"
21+
git config --global user.email "[email protected]"
22+
23+
- name: Update branch
24+
run: |
25+
git fetch stable
26+
git remote add gitlab https://${{ secrets.GITLAB_TOKEN_NAME }}:${{ secrets.GITLAB_TOKEN }}@${{ secrets.GITLAB_URL }}
27+
git checkout stable
28+
git push -f gitlab -u stable

‎.github/workflows/macos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@ jobs:
3333
sudo sh -c 'echo "`ipconfig getifaddr en0` PDC" >> /etc/hosts'
3434
sudo scutil --set HostName PDC
3535
export HG_TRANSPORT="sockets"
36-
ctest -L serial
36+
ctest -L serial --output-on-failure

‎.github/workflows/ubuntu-cache-multithread.yaml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: Ubuntu (multithread)
2+
3+
on:
4+
pull_request:
5+
branches: [ stable, develop ]
6+
7+
push:
8+
branches: [ stable, develop ]
9+
10+
workflow_dispatch:
11+
12+
jobs:
13+
PDC:
14+
runs-on: ubuntu-latest
15+
timeout-minutes: 60
16+
17+
steps:
18+
- uses: actions/checkout@v3
19+
20+
- name: Dependencies
21+
run: .github/workflows/dependencies-linux.sh
22+
23+
- name: Build PDC
24+
run: |
25+
mkdir build && cd build
26+
cmake ../ -DBUILD_MPI_TESTING=ON -DBUILD_SHARED_LIBS=ON -DPDC_SERVER_CACHE=ON -DBUILD_TESTING=ON -DPDC_ENABLE_MPI=ON -DPDC_ENABLE_PROFILING=ON -DPDC_ENABLE_MULTITHREAD=ON -DCMAKE_C_COMPILER=mpicc -DCMAKE_POLICY_VERSION_MINIMUM=3.5
27+
make -j2

‎.github/workflows/ubuntu-cache-profiling.yml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: Ubuntu (profiling)
2+
3+
on:
4+
pull_request:
5+
branches: [ stable, develop ]
6+
7+
push:
8+
branches: [ stable, develop ]
9+
10+
workflow_dispatch:
11+
12+
jobs:
13+
PDC:
14+
runs-on: ubuntu-latest
15+
timeout-minutes: 60
16+
17+
steps:
18+
- uses: actions/checkout@v3
19+
20+
- name: Dependencies
21+
run: .github/workflows/dependencies-linux.sh
22+
23+
- name: Build PDC
24+
run: |
25+
mkdir build && cd build
26+
cmake ../ -DBUILD_MPI_TESTING=ON -DBUILD_SHARED_LIBS=ON -DPDC_SERVER_CACHE=ON -DBUILD_TESTING=ON -DPDC_ENABLE_MPI=ON -DPDC_ENABLE_PROFILING=ON -DCMAKE_C_COMPILER=mpicc -DCMAKE_POLICY_VERSION_MINIMUM=3.5
27+
make -j2
28+
29+
- name: Test PDC
30+
working-directory: build
31+
run: ctest -L serial --output-on-failure

‎.github/workflows/ubuntu-cache.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ jobs:
2828
2929
- name: Test PDC
3030
working-directory: build
31-
run: ctest -L serial
31+
run: ctest -L serial --output-on-failure

‎.github/workflows/ubuntu-no-cache.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ jobs:
2828
2929
- name: Test PDC
3030
working-directory: build
31-
run: ctest -L serial
31+
run: ctest -L serial --output-on-failure

‎.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ src/install
1111
# ignore vscode files
1212
.vscode
1313

14+
# ignore intellij files
15+
.idea
16+
1417
# ignore macos files
1518
.DS_Store
1619

@@ -24,4 +27,4 @@ docs/build
2427
**/*venv
2528

2629
# ignore .zed
27-
.zed
30+
.zed

‎.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ perlmutter-metrics:
457457
PDC_TMPDIR: "${CI_BUILDS_DIR}/${CI_PROJECT_NAME}/${CI_JOB_ID}/pdc-tmp-metrics"
458458
PDC_DATA_LOC: "${CI_BUILDS_DIR}/${CI_PROJECT_NAME}/${CI_JOB_ID}/pdc-data-metrics"
459459
PDC_CLIENT_LOOKUP: "NONE"
460-
PDC_SERVER: "${PDC_BUILD_PATH}/perlmutter/metrics/bin/pdc_server.exe"
460+
PDC_SERVER: "${PDC_BUILD_PATH}/perlmutter/metrics/bin/pdc_server"
461461
PDC_SERVER_CLOSE: "${PDC_BUILD_PATH}/perlmutter/metrics/bin/close_server"
462462
PDC_CLIENT: "${PDC_BUILD_PATH}/perlmutter/metrics/bin/vpicio_mts"
463463
PDC_JOB_OUTPUT: "pdc-metrics.log"

0 commit comments

Comments
 (0)