Skip to content

Commit 518f002

Browse files
SergioMartin86SergioMartin86
committed
Merge branch 'main' of github.com:Algebraic-Programming/TaskR
2 parents e9a662c + d37532d commit 518f002

File tree

158 files changed

+2856
-232
lines changed

Some content is hidden

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

158 files changed

+2856
-232
lines changed

‎.github/workflows/master-test-workflow.yml‎

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,39 @@ jobs:
4040
with:
4141
submodules: 'true'
4242

43+
- name: Build Pybind11
44+
run: |
45+
/usr/bin/python3 -m pip install --upgrade pip pytest
46+
47+
cd extern/pybind11
48+
mkdir -p build
49+
cd build
50+
cmake .. -DPython_EXECUTABLE=/usr/bin/python3
51+
make check -j"$(nproc)"
52+
53+
mkdir -p mock_install/share/pkgconfig
54+
cat <<EOF > mock_install/share/pkgconfig/pybind11.pc
55+
prefix=$(pwd)/..
56+
includedir=\${prefix}/include
57+
58+
Name: pybind11
59+
Description: Seamless operability between C++11 and Python
60+
Version: 2.13.6
61+
Cflags: -I\${includedir}
62+
EOF
63+
64+
echo "PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$(pwd)/mock_install/share/pkgconfig" >> $GITHUB_ENV
65+
4366
- name: Setup
44-
run: source /home/hicr/.bashrc && meson setup build -Dbuildtype=debug -Db_coverage=true -DdistributedEngine=mpi -DbuildTests=true -DbuildExamples=true -DcompileWarningsAsErrors=true
67+
run: source /home/hicr/.bashrc && meson setup build -Dbuildtype=debug -Db_coverage=true -DdistributedEngine=mpi -DbuildTests=true -DbuildExamples=true -DcompileWarningsAsErrors=true -DexecutionStateType=nosv,boost -DprocessingUnitType=nosv,pthreads -DbuildPyTaskR=true
4568

4669
- name: Compile
4770
run: source /home/hicr/.bashrc && meson compile -C build
4871

4972
- name: Running tests and creating coverage report
5073
shell: bash
74+
env:
75+
LD_PRELOAD: /usr/local/lib/libnosv.so
5176
run: |
5277
echo "Running Tests..."
5378
source /home/hicr/.bashrc

‎.github/workflows/pr-development-workflow.yml‎

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ jobs:
231231
docker run --name taskr --shm-size=1024M --privileged -v $PWD:/home/hicr/taskr -w /home/hicr/taskr -td ${{ env.DOCKERIMAGE }}:${{ inputs.arch }}-latest bash
232232
233233
- name: Setup
234-
run: docker exec -u hicr taskr bash -c "meson setup build -Dbuildtype=debug -Db_coverage=true -DdistributedEngine=mpi -DbuildTests=true -DbuildExamples=true -DcompileWarningsAsErrors=true"
234+
run: docker exec -u hicr taskr bash -c "meson setup build -Dbuildtype=debug -Db_coverage=true -DdistributedEngine=mpi -DbuildTests=true -DbuildExamples=true -DcompileWarningsAsErrors=true -DexecutionStateType=nosv,boost -DprocessingUnitType=nosv,pthreads -DbuildPyTaskR=true"
235235

236236
- name: Compile
237237
run: docker exec -u hicr taskr bash -c "meson compile -C build"
@@ -270,14 +270,39 @@ jobs:
270270
with:
271271
submodules: 'true'
272272

273+
- name: Build Pybind11
274+
run: |
275+
/usr/bin/python3 -m pip install --upgrade pip pytest
276+
277+
cd extern/pybind11
278+
mkdir -p build
279+
cd build
280+
cmake .. -DPython_EXECUTABLE=/usr/bin/python3
281+
make check -j"$(nproc)"
282+
283+
mkdir -p mock_install/share/pkgconfig
284+
cat <<EOF > mock_install/share/pkgconfig/pybind11.pc
285+
prefix=$(pwd)/..
286+
includedir=\${prefix}/include
287+
288+
Name: pybind11
289+
Description: Seamless operability between C++11 and Python
290+
Version: 2.13.6
291+
Cflags: -I\${includedir}
292+
EOF
293+
294+
echo "PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$(pwd)/mock_install/share/pkgconfig" >> $GITHUB_ENV
295+
273296
- name: Setup
274-
run: source /home/hicr/.bashrc && meson setup build -Dbuildtype=debug -Db_coverage=true -DdistributedEngine=mpi -DbuildTests=true -DbuildExamples=true -DcompileWarningsAsErrors=true
297+
run: source /home/hicr/.bashrc && meson setup build -Dbuildtype=debug -Db_coverage=true -DdistributedEngine=mpi -DbuildTests=true -DbuildExamples=true -DcompileWarningsAsErrors=true -DexecutionStateType=nosv,boost -DprocessingUnitType=nosv,pthreads -DbuildPyTaskR=true
275298

276299
- name: Compile
277300
run: source /home/hicr/.bashrc && meson compile -C build
278301

279302
- name: Running tests and creating coverage report
280303
shell: bash
304+
env:
305+
LD_PRELOAD: /usr/local/lib/libnosv.so
281306
run: |
282307
echo "Running Tests..."
283308
source /home/hicr/.bashrc

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,5 @@ build
44
.vscode
55
atlas_*.sh
66
**/matrix/
7+
**/__pycache__/
8+
**/ovni/

‎.gitlab-ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ build:
1111
- source /home/hicr/.hicr-env.sh
1212
- echo "Building TaskR..."
1313
- mkdir build
14-
- meson setup build -Dbuildtype=debug -Db_coverage=true -DbuildTests=true -DbuildExamples=true -DdistributedEngine=mpi -DexecutionStateType=boost,nosv -DprocessingUnitType=pthreads,nosv -DbuildInstrumentation=true -DcompileWarningsAsErrors=true
14+
- meson setup build -Dbuildtype=debug -Db_coverage=true -DbuildTests=true -DbuildExamples=true -DdistributedEngine=mpi -DexecutionStateType=boost,nosv -DprocessingUnitType=pthreads,nosv -DbuildInstrumentation=true -DbuildPyTaskR=true -DcompileWarningsAsErrors=true
1515
- meson compile -C build
1616
- echo "Running tests..."
1717
- meson test -C build

‎.gitmodules‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,7 @@
66
path = extern/hicr
77
url = https://github.com/Algebraic-Programming/HiCR.git
88
branch = master
9+
[submodule "extern/pybind11"]
10+
path = extern/pybind11
11+
url = https://github.com/pybind/pybind11.git
12+
branch = stable

examples/local/abcTasks/README.rst renamed to examples/abcTasks/README.rst

File renamed without changes.

examples/local/abcTasks/source/abcTasks.hpp renamed to examples/abcTasks/cpp/abcTasks.hpp

File renamed without changes.

examples/local/abcTasks/source/nosv.cpp renamed to examples/abcTasks/cpp/nosv.cpp

File renamed without changes.

examples/local/abcTasks/source/pthreads.cpp renamed to examples/abcTasks/cpp/pthreads.cpp

File renamed without changes.

‎examples/abcTasks/meson.build‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
testSuite = [ 'examples', 'abcTasks' ]
2+
3+
if 'boost' in get_option('executionStateType') and 'pthreads' in get_option('processingUnitType')
4+
threading = executable('threading', [ 'cpp/pthreads.cpp'], dependencies: [ TaskRBuildDep ])
5+
6+
if get_option('buildTests')
7+
test('threading', threading, args : [ ], suite: testSuite, workdir: threading.path() + '.p' )
8+
endif
9+
endif
10+
11+
if 'nosv' in get_option('executionStateType') and 'nosv' in get_option('processingUnitType')
12+
nosv = executable('nosv', [ 'cpp/nosv.cpp'], dependencies: [ TaskRBuildDep ])
13+
14+
if get_option('buildTests')
15+
test('nosv', nosv, args : [ ], is_parallel : false, suite: testSuite, workdir: nosv.path() + '.p')
16+
endif
17+
endif
18+
19+
if get_option('buildPyTaskR') and get_option('buildTests')
20+
test('pyTaskR',
21+
py,
22+
args : [ 'python/main.py' ],
23+
is_parallel : false,
24+
env: ['PYTHONPATH=' + meson.project_build_root() + '/include/pytaskr/'],
25+
suite: testSuite,
26+
workdir: meson.current_source_dir())
27+
endif

0 commit comments

Comments
 (0)