Skip to content

Commit 93cc3e0

Browse files
RadonirinaunimiRadonirinaunimi
committed
Merge branch 'master' into merge-channel-factors
2 parents eb96610 + 83fb99e commit 93cc3e0

35 files changed

Lines changed: 305 additions & 265 deletions

‎.github/workflows/capi.yaml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ on:
66
- pycli
77
- bump-pyo3-version
88

9+
defaults:
10+
run:
11+
shell: bash
12+
913
jobs:
1014
capi:
1115
runs-on: ubuntu-latest
@@ -32,7 +36,7 @@ jobs:
3236
# if `make` is too old, it doesn't support the `!=` operator
3337
sed -i "s/\([a-zA-Z_]\+\) != \(.*\)$/echo \1 = \$(\2)/e" Makefile
3438
# run tests with sanitizer
35-
make CXXFLAGS="-O0 -ggdb -Wall -Wextra -fsanitize=address,undefined" test-examples
39+
make CXXFLAGS="-O0 -ggdb -Wall -Wextra -Werror -fsanitize=address,undefined" test-examples
3640
3741
- name: Test Fortran examples
3842
run: |
@@ -44,7 +48,7 @@ jobs:
4448
run: |
4549
cd examples/object-oriented-cpp
4650
sed -i "s/\([a-zA-Z_]\+\) != \(.*\)$/echo \1 = \$(\2)/e" Makefile
47-
make CXXFLAGS="-O0 -ggdb -Wall -Wextra -fsanitize=address,undefined" test-examples
51+
make CXXFLAGS="-O0 -ggdb -Wall -Wextra -Werror -fsanitize=address,undefined" test-examples
4852
4953
- name: Generate code coverage
5054
run: |

‎examples/cpp/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
CXX = c++ -std=c++11
2-
CXXFLAGS = -O3 -Wall -Wextra
2+
CXXFLAGS = -O3 -Wall -Wextra -Werror
33
PINEAPPL_DEPS != pkg-config --cflags --libs pineappl_capi
44
LHAPDF_DEPS != pkg-config --cflags --libs lhapdf
55

@@ -27,7 +27,7 @@ PROGRAMS = \
2727
all: $(PROGRAMS)
2828

2929
test-examples: $(PROGRAMS)
30-
set -e && for i in $(PROGRAMS); do ./$${i}; done > test-output && diff -u output test-output && rm test-output
30+
set -e && for i in $(PROGRAMS); do ./$${i} > output; diff -u $${i}.output output; done; rm output
3131

3232
advanced-convolution-deprecated: advanced-convolution-deprecated.cpp
3333
$(CXX) $(CXXFLAGS) $< $(LHAPDF_DEPS) $(PINEAPPL_DEPS) -o $@

‎examples/cpp/advanced-convolution-deprecated.output‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
idx p-p c#0 l#0 p-p~ c#0 l# p-d c#0 l#0 p-d dx
2+
--- ------------ ----------- ------------- ------------ ------
3+
0 5.263109e-01 5.263109e-01 5.293381e-01 5.293381e-01 0.1
4+
1 5.254908e-01 5.254908e-01 5.285057e-01 5.285057e-01 0.1
5+
2 5.246824e-01 5.246824e-01 5.276816e-01 5.276816e-01 0.1
6+
3 5.188340e-01 5.188340e-01 5.217755e-01 5.217755e-01 0.1
7+
4 5.175482e-01 5.175482e-01 5.204635e-01 5.204635e-01 0.1
8+
5 5.008841e-01 5.008841e-01 5.036694e-01 5.036694e-01 0.1
9+
6 4.905325e-01 4.905325e-01 4.932252e-01 4.932252e-01 0.1
10+
7 4.675734e-01 4.675734e-01 4.701121e-01 4.701121e-01 0.1
11+
8 4.393159e-01 4.393159e-01 4.416518e-01 4.416518e-01 0.1
12+
9 3.992921e-01 3.992921e-01 4.013511e-01 4.013511e-01 0.1
13+
10 3.706801e-01 3.706801e-01 3.725679e-01 3.725679e-01 0.1
14+
11 3.264717e-01 3.264717e-01 3.280719e-01 3.280719e-01 0.1
15+
12 2.849345e-01 2.849345e-01 2.863092e-01 2.863092e-01 0.1
16+
13 2.486723e-01 2.486723e-01 2.498556e-01 2.498556e-01 0.1
17+
14 2.110419e-01 2.110419e-01 2.120109e-01 2.120109e-01 0.1
18+
15 1.797439e-01 1.797439e-01 1.805611e-01 1.805611e-01 0.1
19+
16 1.471492e-01 1.471492e-01 1.478035e-01 1.478035e-01 0.1
20+
17 1.205566e-01 1.205566e-01 1.210841e-01 1.210841e-01 0.1
21+
18 9.491625e-02 9.491625e-02 9.532326e-02 9.532326e-02 0.1
22+
19 7.255720e-02 7.255720e-02 7.287318e-02 7.287318e-02 0.1
23+
20 5.056967e-02 5.056967e-02 5.079166e-02 5.079166e-02 0.1
24+
21 3.491788e-02 3.491788e-02 3.507294e-02 3.507294e-02 0.1
25+
22 1.967518e-02 1.967518e-02 1.976542e-02 1.976542e-02 0.1
26+
23 5.565306e-03 5.565306e-03 5.590552e-03 5.590552e-03 0.1

‎examples/cpp/advanced-convolution.output‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
idx p-p c#0 l#0 p-d p-d (w/o μ) dx
2+
--- ------------ ------------ ------------ ------
3+
0 5.293381e-01 5.293381e-01 5.293381e-01 0.1
4+
1 5.285057e-01 5.285057e-01 5.285057e-01 0.1
5+
2 5.276816e-01 5.276816e-01 5.276816e-01 0.1
6+
3 5.217755e-01 5.217755e-01 5.217755e-01 0.1
7+
4 5.204635e-01 5.204635e-01 5.204635e-01 0.1
8+
5 5.036694e-01 5.036694e-01 5.036694e-01 0.1
9+
6 4.932252e-01 4.932252e-01 4.932252e-01 0.1
10+
7 4.701121e-01 4.701121e-01 4.701121e-01 0.1
11+
8 4.416518e-01 4.416518e-01 4.416518e-01 0.1
12+
9 4.013511e-01 4.013511e-01 4.013511e-01 0.1
13+
10 3.725679e-01 3.725679e-01 3.725679e-01 0.1
14+
11 3.280719e-01 3.280719e-01 3.280719e-01 0.1
15+
12 2.863092e-01 2.863092e-01 2.863092e-01 0.1
16+
13 2.498556e-01 2.498556e-01 2.498556e-01 0.1
17+
14 2.120109e-01 2.120109e-01 2.120109e-01 0.1
18+
15 1.805611e-01 1.805611e-01 1.805611e-01 0.1
19+
16 1.478035e-01 1.478035e-01 1.478035e-01 0.1
20+
17 1.210841e-01 1.210841e-01 1.210841e-01 0.1
21+
18 9.532326e-02 9.532326e-02 9.532326e-02 0.1
22+
19 7.287318e-02 7.287318e-02 7.287318e-02 0.1
23+
20 5.079166e-02 5.079166e-02 5.079166e-02 0.1
24+
21 3.507294e-02 3.507294e-02 3.507294e-02 0.1
25+
22 1.976542e-02 1.976542e-02 1.976542e-02 0.1
26+
23 5.590552e-03 5.590552e-03 5.590552e-03 0.1

‎examples/cpp/advanced-filling-deprecated.output‎

Whitespace-only changes.

‎examples/cpp/advanced-filling.output‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
bin left bin right dsig/dx
2+
-------------------------------------
3+
0 0.1 0.000e+00
4+
1.000e-01 2.000e-01 0.000e+00
5+
2.000e-01 3.000e-01 0.000e+00
6+
3.000e-01 4.000e-01 0.000e+00
7+
4.000e-01 5.000e-01 0.000e+00
8+
5.000e-01 6.000e-01 0.000e+00
9+
6.000e-01 7.000e-01 0.000e+00
10+
7.000e-01 8.000e-01 0.000e+00
11+
8.000e-01 9.000e-01 0.000e+00
12+
9.000e-01 1.000e+00 0.000e+00
13+
1.000e+00 1.100e+00 0.000e+00
14+
1.100e+00 1.200e+00 0.000e+00
15+
1.200e+00 1.300e+00 0.000e+00
16+
1.300e+00 1.400e+00 6.683e+03
17+
1.400e+00 1.500e+00 0.000e+00
18+
1.500e+00 1.600e+00 0.000e+00
19+
1.600e+00 1.700e+00 0.000e+00
20+
1.700e+00 1.800e+00 0.000e+00
21+
1.800e+00 1.900e+00 0.000e+00
22+
1.900e+00 2.000e+00 0.000e+00
23+
2.000e+00 2.100e+00 0.000e+00
24+
2.100e+00 2.200e+00 0.000e+00
25+
2.200e+00 2.300e+00 0.000e+00
26+
2.300e+00 2.400e+00 0.000e+00

‎examples/cpp/convolve-grid-deprecated.output‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
idx left right dsig/dx dx
2+
--- ----dim #0--- ------------ ------
3+
0 0 0.1 5.263109e-01 0.1
4+
1 0.1 0.2 5.254908e-01 0.1
5+
2 0.2 0.3 5.246824e-01 0.1
6+
3 0.3 0.4 5.188340e-01 0.1
7+
4 0.4 0.5 5.175482e-01 0.1
8+
5 0.5 0.6 5.008841e-01 0.1
9+
6 0.6 0.7 4.905325e-01 0.1
10+
7 0.7 0.8 4.675734e-01 0.1
11+
8 0.8 0.9 4.393159e-01 0.1
12+
9 0.9 1 3.992921e-01 0.1
13+
10 1 1.1 3.706801e-01 0.1
14+
11 1.1 1.2 3.264717e-01 0.1
15+
12 1.2 1.3 2.849345e-01 0.1
16+
13 1.3 1.4 2.486723e-01 0.1
17+
14 1.4 1.5 2.110419e-01 0.1
18+
15 1.5 1.6 1.797439e-01 0.1
19+
16 1.6 1.7 1.471492e-01 0.1
20+
17 1.7 1.8 1.205566e-01 0.1
21+
18 1.8 1.9 9.491625e-02 0.1
22+
19 1.9 2 7.255720e-02 0.1
23+
20 2 2.1 5.056967e-02 0.1
24+
21 2.1 2.2 3.491788e-02 0.1
25+
22 2.2 2.3 1.967518e-02 0.1
26+
23 2.3 2.4 5.565306e-03 0.1

‎examples/cpp/convolve-grid.output‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
idx left right dsig/dx dx
2+
--- ----dim #0--- ------------ ------
3+
0 0 0.1 5.293381e-01 0.1
4+
1 0.1 0.2 5.285057e-01 0.1
5+
2 0.2 0.3 5.276816e-01 0.1
6+
3 0.3 0.4 5.217755e-01 0.1
7+
4 0.4 0.5 5.204635e-01 0.1
8+
5 0.5 0.6 5.036694e-01 0.1
9+
6 0.6 0.7 4.932252e-01 0.1
10+
7 0.7 0.8 4.701121e-01 0.1
11+
8 0.8 0.9 4.416518e-01 0.1
12+
9 0.9 1 4.013511e-01 0.1
13+
10 1 1.1 3.725679e-01 0.1
14+
11 1.1 1.2 3.280719e-01 0.1
15+
12 1.2 1.3 2.863092e-01 0.1
16+
13 1.3 1.4 2.498556e-01 0.1
17+
14 1.4 1.5 2.120109e-01 0.1
18+
15 1.5 1.6 1.805611e-01 0.1
19+
16 1.6 1.7 1.478035e-01 0.1
20+
17 1.7 1.8 1.210841e-01 0.1
21+
18 1.8 1.9 9.532326e-02 0.1
22+
19 1.9 2 7.287318e-02 0.1
23+
20 2 2.1 5.079166e-02 0.1
24+
21 2.1 2.2 3.507294e-02 0.1
25+
22 2.2 2.3 1.976542e-02 0.1
26+
23 2.3 2.4 5.590552e-03 0.1

‎examples/cpp/deprecated.output‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
idx p-p c#0 l#0 p-p~ c#0 l# p-d c#0 l#0 p-d dx
2+
--- ------------ ----------- ------------- ------------ ------
3+
0 5.263109e-01 5.263109e-01 5.263109e-01 5.263109e-01 0.1
4+
1 5.254908e-01 5.254908e-01 5.254908e-01 5.254908e-01 0.1
5+
2 5.246824e-01 5.246824e-01 5.246824e-01 5.246824e-01 0.1
6+
3 5.188340e-01 5.188340e-01 5.188340e-01 5.188340e-01 0.1
7+
4 5.175482e-01 5.175482e-01 5.175482e-01 5.175482e-01 0.1
8+
5 5.008841e-01 5.008841e-01 5.008841e-01 5.008841e-01 0.1
9+
6 4.905325e-01 4.905325e-01 4.905325e-01 4.905325e-01 0.1
10+
7 4.675734e-01 4.675734e-01 4.675734e-01 4.675734e-01 0.1
11+
8 4.393159e-01 4.393159e-01 4.393159e-01 4.393159e-01 0.1
12+
9 3.992921e-01 3.992921e-01 3.992921e-01 3.992921e-01 0.1
13+
10 3.706801e-01 3.706801e-01 3.706801e-01 3.706801e-01 0.1
14+
11 3.264717e-01 3.264717e-01 3.264717e-01 3.264717e-01 0.1
15+
12 2.849345e-01 2.849345e-01 2.849345e-01 2.849345e-01 0.1
16+
13 2.486723e-01 2.486723e-01 2.486723e-01 2.486723e-01 0.1
17+
14 2.110419e-01 2.110419e-01 2.110419e-01 2.110419e-01 0.1
18+
15 1.797439e-01 1.797439e-01 1.797439e-01 1.797439e-01 0.1
19+
16 1.471492e-01 1.471492e-01 1.471492e-01 1.471492e-01 0.1
20+
17 1.205566e-01 1.205566e-01 1.205566e-01 1.205566e-01 0.1
21+
18 9.491625e-02 9.491625e-02 9.491625e-02 9.491625e-02 0.1
22+
19 7.255720e-02 7.255720e-02 7.255720e-02 7.255720e-02 0.1
23+
20 5.056967e-02 5.056967e-02 5.056967e-02 5.056967e-02 0.1
24+
21 3.491788e-02 3.491788e-02 3.491788e-02 3.491788e-02 0.1
25+
22 1.967518e-02 1.967518e-02 1.967518e-02 1.967518e-02 0.1
26+
23 5.565306e-03 5.565306e-03 5.565306e-03 5.565306e-03 0.1

‎examples/cpp/display-channels-deprecated.output‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
0 1 x ( 22, 22)
2+
1 1 x ( 1, -1) + 1 x ( 3, -3) + 1 x ( 5, -5)

0 commit comments

Comments
 (0)