Skip to content

Commit

Permalink
Merge remote-tracking branch 'app4triqs_remote/cpp_only_notriqs' into…
Browse files Browse the repository at this point in the history
… unstable
  • Loading branch information
Wentzell committed Aug 10, 2020
2 parents 6cd0bfd + fad8bde commit 4023778
Show file tree
Hide file tree
Showing 14 changed files with 135 additions and 713 deletions.
76 changes: 76 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
name: build

on:
push:
branches: [ unstable ]
pull_request:
branches: [ unstable ]

jobs:
build:

strategy:
matrix:
include:
- {os: ubuntu-20.04, cc: gcc-10, cxx: g++-10}
- {os: ubuntu-20.04, cc: clang-10, cxx: clang++-10}
- {os: macos-10.15, cc: gcc-10, cxx: g++-10}
- {os: macos-10.15, cc: /usr/local/opt/llvm/bin/clang, cxx: /usr/local/opt/llvm/bin/clang++}

runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v2

- name: Install ubuntu dependencies
if: matrix.os == 'ubuntu-20.04'
run: >
sudo apt-get install
clang-10
g++-10
gfortran
hdf5-tools
libblas-dev
libclang-10-dev
libc++-10-dev
libc++abi-10-dev
libgfortran4
libgmp-dev
libhdf5-dev
liblapack-dev
libopenmpi-dev
openmpi-bin
openmpi-common
openmpi-doc
python3-clang-10
python3-dev
python3-mako
python3-mpi4py
python3-numpy
python3-pip
python3-scipy
python3-sphinx
python3-nbsphinx
- name: Install homebrew dependencies
if: matrix.os == 'macos-10.15'
run: |
brew install gcc@10 llvm@10 hdf5 open-mpi openblas numpy scipy mpi4py
pip3 install mako
pip3 install -r requirements.txt
- name: Build itertools
env:
CC: ${{ matrix.cc }}
CXX: ${{ matrix.cxx }}
LIBRARY_PATH: /usr/local/opt/llvm/lib
run: |
mkdir build && cmake -B build -DCMAKE_INSTALL_PREFIX=$HOME/install
cmake --build build -j2
- name: Test itertools
env:
DYLD_FALLBACK_LIBRARY_PATH: /usr/local/opt/llvm/lib
run: |
cd build
ctest -j2 --output-on-failure
34 changes: 0 additions & 34 deletions .travis.yml

This file was deleted.

1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ target_compile_options(${PROJECT_NAME}_warnings
-Wextra
-Wpedantic
-Wno-sign-compare
-Wno-deprecated-comma-subscript
$<$<CXX_COMPILER_ID:GNU>:-Wshadow=local>
$<$<CXX_COMPILER_ID:GNU>:-Wno-attributes>
$<$<CXX_COMPILER_ID:Clang>:-Wshadow>
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
[![build](https://github.com/TRIQS/itertools/workflows/build/badge.svg?branch=notriqs)](https://github.com/TRIQS/itertools/actions?query=workflow%3Abuild)

# itertools

itertools is a single-header C++ library that allows, with a simple interface, for the writing of
Expand Down
49 changes: 31 additions & 18 deletions deps/external_dependency.cmake
Original file line number Diff line number Diff line change
@@ -1,25 +1,38 @@
###################################################################################
# Copyright (c) 2020 Simons Foundation
#
# APP4TRIQS: a Toolbox for Research in Interacting Quantum Systems
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# Copyright (C) 2020 Simons Foundation
# authors: N. Wentzell
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# APP4TRIQS is free software: you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation, either version 3 of the License, or (at your option) any later
# version.
#
# APP4TRIQS is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
# details.
#
# You should have received a copy of the GNU General Public License along with
# APP4TRIQS. If not, see <http://www.gnu.org/licenses/>.
#
###################################################################################
# You may obtain a copy of the License at
# https://www.gnu.org/licenses/gpl-3.0.txt


# Consider ROOT env variables in find_package
if(POLICY CMP0074)
cmake_policy(SET CMP0074 NEW)
endif()

# Make sure that imported targets are always global
get_property(IMPORTED_ALWAYS_GLOBAL GLOBAL PROPERTY IMPORTED_ALWAYS_GLOBAL)
if(NOT IMPORTED_ALWAYS_GLOBAL)
function(add_library)
set(_args ${ARGN})
if ("${_args}" MATCHES ";IMPORTED")
list(APPEND _args GLOBAL)
endif()
_add_library(${_args})
endfunction()
set_property(GLOBAL PROPERTY IMPORTED_ALWAYS_GLOBAL TRUE)
endif()

# Define External Dependency Function
function(external_dependency)
cmake_parse_arguments(ARG "EXCLUDE_FROM_ALL;BUILD_ALWAYS" "VERSION;GIT_REPO;GIT_TAG" "" ${ARGN})

Expand Down
2 changes: 1 addition & 1 deletion doc/conf.py.in
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ version = '@PROJECT_VERSION@'

copyright = '2017-2018 N. Wentzell, O. Parcollet 2018-2019 The Simons Foundation, authors: N. Wentzell, D. Simons, H. Strand, O. Parcollet'

mathjax_path = "https://raw.githubusercontent.com/mathjax/MathJax/2.7.8/MathJax.js"
mathjax_path = "https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.7/MathJax.js?config=default"
templates_path = ['@CMAKE_CURRENT_SOURCE_DIR@/_templates']

html_theme = 'triqs'
Expand Down
92 changes: 0 additions & 92 deletions doc/themes/agogo/layout.html

This file was deleted.

Loading

0 comments on commit 4023778

Please sign in to comment.