+
Skip to content

Travis improvements #117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Sep 2, 2017
Merged

Travis improvements #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
52aa133
Adding style check script (not used in Travis yet)
henryiii Sep 1, 2017
b6d14f5
Preparing style check
henryiii Sep 1, 2017
619c896
Adding clang-tidy fix
henryiii Sep 1, 2017
a239561
refix CMakeLists
henryiii Sep 1, 2017
de07362
Adding clang-tidy changes
henryiii Sep 1, 2017
0aeafd1
Nicer travis
henryiii Sep 1, 2017
62df460
Merge branch 'master' into ci
henryiii Sep 2, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions .ci/check_style.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#!/usr/bin/env sh
set -evx

clang-format --version

git ls-files -- '*.cpp' '*.hpp' '*.cu' '*.cc' | xargs clang-format -style=file -i

git diff --exit-code --color

mkdir build || true
cd build
cmake .. -DGOOFIT_TIDY_FIX=ON
cmake --build .

git diff --exit-code --color

set +evx
3 changes: 3 additions & 0 deletions .ci/prepare_altern.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ if [ "$CXX" = "g++" ] ; then
else
ln -s `which clang-$COMPILER` clang
ln -s `which clang++-$COMPILER` clang++
ln -s `which clang-format-$COMPILER` clang-format
ln -s `which clang-tidy-$COMPILER` clang-tidy
export CXXFLAGS="-stdlib=libc++"
fi

export PATH="${DEPS_DIR}/extrabin":$PATH
Expand Down
2 changes: 1 addition & 1 deletion .clang-format
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ KeepEmptyLinesAtTheStartOfBlocks: false
# ReflowComments: true
SortIncludes: false
# SpaceAfterCStyleCast: false
SpaceAfterTemplateKeyword: false
# SpaceAfterTemplateKeyword: false
# SpaceBeforeAssignmentOperators: true
SpaceBeforeParens: Never
# SpaceInEmptyParentheses: false
Expand Down
82 changes: 52 additions & 30 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,38 +13,60 @@ env:
global:
- CTEST_OUTPUT_ON_FAILURE: 1
- OMP_NUM_THREADS: 2
- COMPILER: 4.8
- DOXYFILE: $TRAVIS_BUILD_DIR/docs/Doxyfile
- secure: UxIkC5evjPTPkh4tG9VIK4Hjy0+Wbm69qu54jde0EMjlP3FzLrvXCKr1gh/Y6ywzQYSWE2fAsDWwQGmfqaphAFpjjT1S3Bwpa6ojTikjBe16jaCgIKtRiVXBr9LsNl3W7W9pDrXs1Ue40mSEksZJm8a9G7H4Ibb7K3izrllkhuQ=
addons:
apt:
packages:
- doxygen-latex
- graphviz
- g++-4.8
- gcc-4.8
- libx11-dev
- libxpm-dev
- libxft-dev
- libxext-dev
- python-pip
matrix:
include:
- compiler: clang
addons:
apt:
sources:
- llvm-toolchain-trusty-4.0
packages:
- clang-4.0
- clang-format-4.0
- clang-tidy-4.0
- libc++-dev
env:
- COMPILER=4.0 CHECK_STYLE=yes CC=clang-4.0 CXX=clang++-4.0
install:
- |
DEPS_DIR="${TRAVIS_BUILD_DIR}/deps"
cd "${TRAVIS_BUILD_DIR}" && . .ci/prepare_altern.sh
cd "${TRAVIS_BUILD_DIR}" && . .ci/build_cmake.sh
script:
- cd "${TRAVIS_BUILD_DIR}" && .ci/check_style.sh
- compiler: gcc
addons:
apt:
packages:
- doxygen-latex
- graphviz
- g++-4.8
- gcc-4.8
- libx11-dev
- libxpm-dev
- libxft-dev
- libxext-dev
- python-pip
env:
- COMPILER=4.8 DOXYFILE=$TRAVIS_BUILD_DIR/docs/Doxyfile
script:
- cd "${TRAVIS_BUILD_DIR}" && .ci/travis.sh
after_success:
- echo "${TRAVIS_BRANCH} ${TRAVIS_PULL_REQUEST}"
- if [[ "${TRAVIS_BRANCH}" == "master" && "${TRAVIS_PULL_REQUEST}" == "false" ]] ; then echo "Updating docs" && cd "${TRAVIS_BUILD_DIR}" && .ci/build_docs.sh ; fi

install:
- DEPS_DIR="${TRAVIS_BUILD_DIR}/deps"
- cd "${TRAVIS_BUILD_DIR}" && . .ci/prepare_altern.sh
- cd "${TRAVIS_BUILD_DIR}" && . .ci/build_cmake.sh
- cd "${TRAVIS_BUILD_DIR}" && . .ci/build_root.sh
- cd "${TRAVIS_BUILD_DIR}" && . .ci/build_doxygen.sh
- cd "${TRAVIS_BUILD_DIR}" && . .ci/build_lcov.sh
- pip install --user --upgrade pip
- pip install --user pytest numpy plumbum
script:
- cd "${TRAVIS_BUILD_DIR}"
- .ci/travis.sh
after_success:
- echo "${TRAVIS_BRANCH}"
- echo "${TRAVIS_PULL_REQUEST}"
- if [[ "${TRAVIS_BRANCH}" == "master" && "${TRAVIS_PULL_REQUEST}" == "false" ]] ; then echo "Updating docs" && cd "${TRAVIS_BUILD_DIR}" && .ci/build_docs.sh
; fi
- |
DEPS_DIR="${TRAVIS_BUILD_DIR}/deps"
cd "${TRAVIS_BUILD_DIR}" && . .ci/prepare_altern.sh
cd "${TRAVIS_BUILD_DIR}" && . .ci/build_cmake.sh
cd "${TRAVIS_BUILD_DIR}" && . .ci/build_root.sh
cd "${TRAVIS_BUILD_DIR}" && . .ci/build_doxygen.sh
cd "${TRAVIS_BUILD_DIR}" && . .ci/build_lcov.sh
pip install --user --upgrade pip
pip install --user pytest numpy plumbum

notifications:
webhooks:
urls:
Expand Down
4 changes: 2 additions & 2 deletions examples/2d_plot/2d_plot.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ int main(int argc, char **argv) {
gStyle->SetFuncWidth(1);
gStyle->SetLineWidth(1);
gStyle->SetLineColor(1);
if(ROOT_VERSION_CODE < ROOT_VERSION(6,6,0))
if(ROOT_VERSION_CODE < ROOT_VERSION(6, 6, 0))
gStyle->SetPalette(kRainBow, 0);
else
gStyle->SetPalette(kViridis, 0);
Expand Down Expand Up @@ -112,7 +112,7 @@ int main(int argc, char **argv) {
xpdfHist.SetStats(false);
ypdfHist.SetStats(false);

UnbinnedDataSet grid = total.makeGrid();
UnbinnedDataSet grid = total.makeGrid();
total.setData(&grid);
std::vector<std::vector<double>> pdfVals = total.getCompProbsAtDataPoints();

Expand Down
21 changes: 14 additions & 7 deletions examples/dalitz/dalitz.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,8 @@ DalitzPlotPdf *makeSignalPdf(GooPdf *eff = 0) {
1,
PAIR_13);

ResonancePdf *f0_980 = new ResonancePdf("f0_980", ResPdfType::RBW,
ResonancePdf *f0_980 = new ResonancePdf("f0_980",
ResPdfType::RBW,
fixAmps ? new Variable("f0_980_amp_real", 0.008 * (-_mD02))
: new Variable("f0_980_amp_real", 0.008 * (-_mD02), 0.001, 0, 0),
fixAmps ? new Variable("f0_980_amp_imag", -0.013 * (-_mD02))
Expand All @@ -269,7 +270,8 @@ DalitzPlotPdf *makeSignalPdf(GooPdf *eff = 0) {
0,
PAIR_23);

ResonancePdf *f0_1370 = new ResonancePdf("f0_1370", ResPdfType::RBW,
ResonancePdf *f0_1370 = new ResonancePdf("f0_1370",
ResPdfType::RBW,
fixAmps ? new Variable("f0_1370_amp_real", -0.058 * (-_mD02))
: new Variable("f0_1370_amp_real", -0.058 * (-_mD02), 0.001, 0, 0),
fixAmps ? new Variable("f0_1370_amp_imag", 0.026 * (-_mD02))
Expand All @@ -279,7 +281,8 @@ DalitzPlotPdf *makeSignalPdf(GooPdf *eff = 0) {
0,
PAIR_23);

ResonancePdf *f0_1500 = new ResonancePdf("f0_1500", ResPdfType::RBW,
ResonancePdf *f0_1500 = new ResonancePdf("f0_1500",
ResPdfType::RBW,
fixAmps ? new Variable("f0_1500_amp_real", 0.057 * (-_mD02))
: new Variable("f0_1500_amp_real", 0.057 * (-_mD02), 0.001, 0, 0),
fixAmps ? new Variable("f0_1500_amp_imag", 0.012 * (-_mD02))
Expand All @@ -289,7 +292,8 @@ DalitzPlotPdf *makeSignalPdf(GooPdf *eff = 0) {
0,
PAIR_23);

ResonancePdf *f0_1710 = new ResonancePdf("f0_1710", ResPdfType::RBW,
ResonancePdf *f0_1710 = new ResonancePdf("f0_1710",
ResPdfType::RBW,
fixAmps ? new Variable("f0_1710_amp_real", 0.070 * (-_mD02))
: new Variable("f0_1710_amp_real", 0.070 * (-_mD02), 0.001, 0, 0),
fixAmps ? new Variable("f0_1710_amp_imag", 0.087 * (-_mD02))
Expand All @@ -300,7 +304,8 @@ DalitzPlotPdf *makeSignalPdf(GooPdf *eff = 0) {
PAIR_23);

ResonancePdf *f2_1270
= new ResonancePdf("f2_1270", ResPdfType::RBW,
= new ResonancePdf("f2_1270",
ResPdfType::RBW,
fixAmps ? new Variable("f2_1270_amp_real", -1.027 * (-_mD02inv))
: new Variable("f2_1270_amp_real", -1.027 * (-_mD02inv), 0.001, 0, 0),
fixAmps ? new Variable("f2_1270_amp_imag", -0.162 * (-_mD02inv))
Expand All @@ -310,7 +315,8 @@ DalitzPlotPdf *makeSignalPdf(GooPdf *eff = 0) {
2,
PAIR_23);

ResonancePdf *f0_600 = new ResonancePdf("f0_600", ResPdfType::RBW,
ResonancePdf *f0_600 = new ResonancePdf("f0_600",
ResPdfType::RBW,
fixAmps ? new Variable("f0_600_amp_real", 0.068 * (-_mD02))
: new Variable("f0_600_amp_real", 0.068 * (-_mD02), 0.001, 0, 0),
fixAmps ? new Variable("f0_600_amp_imag", 0.010 * (-_mD02))
Expand All @@ -320,7 +326,8 @@ DalitzPlotPdf *makeSignalPdf(GooPdf *eff = 0) {
0,
PAIR_23);

ResonancePdf *nonr = new ResonancePdf("nonr", ResPdfType::NONRES,
ResonancePdf *nonr = new ResonancePdf("nonr",
ResPdfType::NONRES,
fixAmps ? new Variable("nonr_amp_real", 0.5595 * (-1))
: new Variable("nonr_amp_real", 0.5595 * (-1), 0.001, 0, 0),
fixAmps ? new Variable("nonr_amp_imag", -0.108761 * (-1))
Expand Down
Loading
点击 这是indexloc提供的php浏览器服务，不要输入任何密码和下载