Skip to content

Commit fa92e28

Browse files
latessalatessa
authored
Merge pull request #38 from JETSCAPE/latessa/gtl_binary_function
remove gtl binary_function & add macOS workflow
2 parents 057a6b4 + 39993ff commit fa92e28

14 files changed

+126
-21
lines changed

‎.github/workflows/plot_observables.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
push:
55
branches:
66
- main
7-
- XSCAPE-1.1.4-RC
7+
- XSCAPE-1.1.5-RC
88

99
env:
1010
PULL_NUMBER: ${{ github.event.number }}

‎.github/workflows/smash_test_completes.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ on:
44
pull_request:
55
branches:
66
- main
7-
- XSCAPE-1.1.4-RC
7+
- XSCAPE-1.1.5-RC
88

99
push:
1010
branches:
1111
- main
12-
- XSCAPE-1.1.4-RC
12+
- XSCAPE-1.1.5-RC
1313

1414
env:
1515
REPO_NAME: ${{ github.event.repository.name }}

‎.github/workflows/test-build-external.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ on:
44
pull_request:
55
branches:
66
- main
7-
- XSCAPE-1.1.4-RC
7+
- XSCAPE-1.1.5-RC
88

99
push:
1010
branches:
1111
- main
12-
- XSCAPE-1.1.4-RC
12+
- XSCAPE-1.1.5-RC
1313

1414
env:
1515
REPO_NAME: ${{ github.event.repository.name }}

‎.github/workflows/test-build-macos-native.yaml

+106
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
name: test build macOS native
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- main
7+
- XSCAPE-1.1.5-RC
8+
- latessa/gtl_binary_function
9+
10+
push:
11+
branches:
12+
- main
13+
- XSCAPE-1.1.5-RC
14+
- latessa/gtl_binary_function
15+
16+
env:
17+
REPO_NAME: ${{ github.event.repository.name }}
18+
19+
jobs:
20+
build:
21+
name: install packages and build
22+
runs-on: ${{ matrix.os }}
23+
strategy:
24+
matrix:
25+
os: [macos-14, macos-15]
26+
27+
steps:
28+
29+
- name: brew install dependencies
30+
run: |
31+
export NONINTERACTIVE=1
32+
brew update
33+
brew cleanup
34+
brew install --formula cmake
35+
brew install --formula doxygen
36+
brew install --formula root
37+
brew install --formula graph-tool
38+
brew install --formula hdf5
39+
brew install --formula open-mpi
40+
brew install --formula gsl
41+
brew install --formula boost
42+
brew install --formula zlib
43+
. /opt/homebrew/bin/thisroot.sh
44+
- name: set environment variables
45+
run: |
46+
export ROOTSYS="/usr/local/root"
47+
export PATH="$ROOTSYS/bin:\$PATH"
48+
export LD_LIBRARY_PATH="$ROOTSYS/lib:$LD_LIBRARY_PATH"
49+
export PYTHONPATH="$ROOTSYS/lib"
50+
- name: install HepMC 3.2.6
51+
run: | # brew tap davidchall/hep
52+
brew tap davidchall/homebrew-hep
53+
cd $(brew --repository)/Library/Taps/davidchall/homebrew-hep
54+
echo "Current directory: $(pwd)"
55+
git checkout f643d5cacc19fd0b01d0ecba0daf30452152da03
56+
NONINTERACTIVE=1 brew install davidchall/hep/hepmc3
57+
- name: install Pythia 8309
58+
run: |
59+
cd $(brew --repository)/Library/Taps/davidchall/homebrew-hep
60+
echo "Current directory: $(pwd)"
61+
git checkout 141f8548d045df88d498ab44df16d2091742e4b1
62+
NONINTERACTIVE=1 brew install davidchall/hep/pythia
63+
- name: set more variables
64+
run: |
65+
export JETSCAPE_DIR="${GITHUB_WORKSPACE}/${REPO_NAME}"
66+
- name: Checkout JETSCAPE Repository
67+
uses: actions/checkout@v4
68+
with:
69+
path: ${{ github.event.repository.name }}
70+
71+
- name: Download MUSIC
72+
run: |
73+
cd ${GITHUB_WORKSPACE}/${REPO_NAME}/external_packages
74+
./get_music.sh
75+
- name: Download ISS
76+
run: |
77+
cd ${GITHUB_WORKSPACE}/${REPO_NAME}/external_packages
78+
./get_iSS.sh
79+
- name: Download FREESTREAM
80+
run: |
81+
cd ${GITHUB_WORKSPACE}/${REPO_NAME}/external_packages
82+
./get_freestream-milne.sh
83+
- name: Download SMASH
84+
run: |
85+
export PYTHIA8DIR="/opt/homebrew/opt/pythia"
86+
cd ${GITHUB_WORKSPACE}/${REPO_NAME}/external_packages
87+
./get_smash.sh
88+
- name: Download 3DGlauber
89+
run: |
90+
cd ${GITHUB_WORKSPACE}/${REPO_NAME}/external_packages
91+
./get_3dglauber.sh
92+
- name: Build Application
93+
run: |
94+
cd ${GITHUB_WORKSPACE}/${REPO_NAME}
95+
mkdir build
96+
cd build
97+
export SMASH_DIR="${GITHUB_WORKSPACE}/${REPO_NAME}/external_packages/smash/smash_code"
98+
echo "This is SMASH_DIR: "
99+
echo ${SMASH_DIR}
100+
ls ${SMASH_DIR}
101+
cmake .. -DUSE_3DGlauber=ON -DUSE_MUSIC=ON -DUSE_ISS=ON -DUSE_FREESTREAM=ON -DUSE_SMASH=ON
102+
make -j2
103+
- name: Test Run
104+
run: |
105+
cd ${GITHUB_WORKSPACE}/${REPO_NAME}/build
106+
./runJetscape ../config/publications_config/arXiv_1910.05481/jetscape_user_PP_1910.05481.xml

‎.github/workflows/test-events-PbPb.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ on:
44
pull_request:
55
branches:
66
- main
7-
- XSCAPE-1.1.4-RC
7+
- XSCAPE-1.1.5-RC
88

99
push:
1010
branches:
1111
- main
12-
- XSCAPE-1.1.4-RC
12+
- XSCAPE-1.1.5-RC
1313

1414
env:
1515
REPO_NAME: ${{ github.event.repository.name }}

‎.github/workflows/test-events-Pythia-Isr-Dat.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ on:
66
pull_request:
77
branches:
88
- main
9-
- XSCAPE-1.1.4-RC
9+
- XSCAPE-1.1.5-RC
1010

1111
push:
1212
branches:
1313
- main
14-
- XSCAPE-1.1.4-RC
14+
- XSCAPE-1.1.5-RC
1515

1616
env:
1717
REPO_NAME: ${{ github.event.repository.name }}

‎.github/workflows/test-events-Pythia-Isr-Hadron.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ on:
44
pull_request:
55
branches:
66
- main
7-
- XSCAPE-1.1.4-RC
7+
- XSCAPE-1.1.5-RC
88

99
push:
1010
branches:
1111
- main
12-
- XSCAPE-1.1.4-RC
12+
- XSCAPE-1.1.5-RC
1313

1414
env:
1515
REPO_NAME: ${{ github.event.repository.name }}

‎.github/workflows/test-events-Pythia-Isr-Parton.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ on:
44
pull_request:
55
branches:
66
- main
7-
- XSCAPE-1.1.4-RC
7+
- XSCAPE-1.1.5-RC
88

99
push:
1010
branches:
1111
- main
12-
- XSCAPE-1.1.4-RC
12+
- XSCAPE-1.1.5-RC
1313

1414
env:
1515
REPO_NAME: ${{ github.event.repository.name }}

‎.github/workflows/test-events-brick.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ on:
44
pull_request:
55
branches:
66
- main
7-
- XSCAPE-1.1.4-RC
7+
- XSCAPE-1.1.5-RC
88
- brick_matter_lbt
99

1010
push:
1111
branches:
1212
- main
13-
- XSCAPE-1.1.4-RC
13+
- XSCAPE-1.1.5-RC
1414
- brick_matter_lbt
1515

1616
env:

‎.github/workflows/test-events-pp.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ on:
44
pull_request:
55
branches:
66
- main
7-
- XSCAPE-1.1.4-RC
7+
- XSCAPE-1.1.5-RC
88

99
push:
1010
branches:
1111
- main
12-
- XSCAPE-1.1.4-RC
12+
- XSCAPE-1.1.5-RC
1313

1414
env:
1515
REPO_NAME: ${{ github.event.repository.name }}

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# X-SCAPE 1.1.4
1+
# X-SCAPE 1.1.5
22

33
The X-ion collisions with a Statistically and Computationally Advanced Program Envelope (X-SCAPE) is the enhanced (and 2nd) project of the JETSCAPE
44
collaboration which extends the framework to include small systems created in p-A and p-p collisions, lower energy heavy-ion collisions and electron-Ion collisions.

‎external_packages/gtl/include/GTL/GTL.h

-1
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,6 @@ using std::stack;
163163
using std::map;
164164
using std::set;
165165
using std::allocator;
166-
using std::binary_function;
167166
using std::ostream;
168167
using std::ofstream;
169168
using std::cout;

‎external_packages/gtl/src/bid_dijkstra.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ __GTL_BEGIN_NAMESPACE
3030
* @internal
3131
* Binary predicate that compares two nodes according to their distance.
3232
*/
33-
class less_dist : public binary_function<node, node, bool>
33+
class less_dist
3434
{
3535
public:
3636
/**

‎external_packages/gtl/src/dijkstra.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ __GTL_BEGIN_NAMESPACE
3030
* @internal
3131
* Binary predicate that compares two nodes according to their distance.
3232
*/
33-
class less_dist : public binary_function<node, node, bool>
33+
class less_dist
3434
{
3535
public:
3636
/**

0 commit comments

Comments
 (0)