Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/conda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ name: Conda packages

on:
pull_request:
# branches-ignore:
# - "*"
branches-ignore:
- "*"
paths:
- "**"
- "!.github/workflows/*"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ name: Linux CI

on:
pull_request:
# branches-ignore:
# - "*"
branches-ignore:
- "*"
paths:
- "**"
- "!.github/workflows/*"
Expand Down
14 changes: 11 additions & 3 deletions .github/workflows/macos-homebrew.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
strategy:
fail-fast: false
matrix:
macos_version: ["14", "15"]
macos_version: ["14"] # TODO uncomment this version again, "15"]
compiler:
- { name: clang, c: clang, cxx: clang++ }
python_version: ["3.13"]
Expand Down Expand Up @@ -67,7 +67,9 @@ jobs:

- name: setup platform
run: |
HOMEBREW_NO_AUTO_UPDATE=1 brew install \
# HOMEBREW_NO_AUTO_UPDATE=1 brew install
# brew install --overwrite
brew install \
boost \
cxxopts \
gdal \
Expand All @@ -76,10 +78,12 @@ jobs:
hdf5 \
hwloc \
lftp \
ninja \
nlohmann-json \
numpy \
pybind11 \
python-matplotlib
brew upgrade cmake
python${{ matrix.python_version }} -m venv --system-site-packages env
source env/bin/activate
pip${{ matrix.python_version }} install --upgrade pip
Expand All @@ -88,7 +92,7 @@ jobs:
- name: "install hpx"
uses: ./lue_source/.github/actions/install_hpx
env:
hpx_build_nr: 1
hpx_build_nr: 2
with:
cache_key: macos-${{ matrix.macos_version }}_${{ matrix.compiler.cxx }}_python-${{ matrix.python_version }}_hpx-${{ env.hpx_version }}-${{ env.hpx_build_nr }}
c_compiler: ${{ matrix.compiler.c }}
Expand All @@ -114,6 +118,10 @@ jobs:

- name: configure
run: |
ls -ltr ${{ env.hpx_install_directory }}/lib/cmake/HPX
cat ${{ env.hpx_install_directory }}/lib/cmake/HPX/HPXConfig.cmake
cat ${{ env.hpx_install_directory }}/lib/cmake/HPX/HPXConfigVersion.cmake

source env/bin/activate
mkdir ${{ env.lue_build_directory }}

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/windows-conan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ name: Windows CI (Conan)

on:
pull_request:
# branches-ignore:
# - "*"
branches-ignore:
- "*"
paths:
- "**"
- "!.github/workflows/*"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/windows-conda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ name: Windows CI (Conda)

on:
pull_request:
# branches-ignore:
# - "*"
branches-ignore:
- "*"
paths:
- "**"
- "!.github/workflows/*"
Expand Down
10 changes: 8 additions & 2 deletions CMakeHPXPresets.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
{
"version": 6,
"version": 10,
"configurePresets": [
{
"name": "hpx_shared_configuration",
"hidden": true,
"$comment": [
"HPX_USE_CMAKE_CXX_STANDARD: TRUE"
],
"cacheVariables": {
"HPX_USE_CMAKE_CXX_STANDARD": "TRUE",
"HPX_WITH_CXX_STANDARD": "23",
"HPX_WITH_EXAMPLES": "FALSE",
"HPX_WITH_HWLOC": "TRUE",
"HPX_WITH_PKGCONFIG": "FALSE",
Expand Down Expand Up @@ -44,6 +47,9 @@
{
"name": "hpx_macos_configuration",
"hidden": true,
"$comment": [
"homebrew's asio doesn't work (too new?)"
],
"cacheVariables": {
"HPX_WITH_FETCH_ASIO": "TRUE",
"HPX_WITH_FETCH_HWLOC": "FALSE",
Expand Down
11 changes: 2 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ without the user having to know about high-performance computing and
the related technology.

- [Homepage](https://lue.computationalgeography.org)
- [Documentation](https://lue.computationalgeography.org/doc)
- [Publications](https://lue.computationalgeography.org/publication)
- [Documentation](https://lue.computationalgeography.org/doc)
- [Publications](https://lue.computationalgeography.org/publication)
- [R&D team](https://www.computationalgeography.org)
- [![Chat with us on Matrix](https://img.shields.io/badge/chat-on%20Matrix-%230098D4)](https://matrix.to/#/#lue:matrix.org)
(users)
Expand All @@ -37,16 +37,9 @@ the related technology.

[![Latest release](https://zenodo.org/badge/DOI/10.5281/zenodo.5535685.svg)](https://doi.org/10.5281/zenodo.5535685)


## Source code

[![License](https://img.shields.io/github/license/mashape/apistatus.svg)](https://github.com/computationalgeography/lue/)
[![Codacy Badge](https://app.codacy.com/project/badge/Grade/2c02fc1c5b13424abfc414b82104801d)](https://www.codacy.com/gh/computationalgeography/lue/dashboard?utm_source=github.com&utm_medium=referral&utm_content=computationalgeography/lue&utm_campaign=Badge_Grade)
[![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit)](https://github.com/pre-commit/pre-commit)
[![Checked with mypy](https://www.mypy-lang.org/static/mypy_badge.svg)](https://mypy-lang.org/)
[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
[![Imports: isort](https://img.shields.io/badge/%20imports-isort-%231674b1?style=flat&labelColor=ef8336)](https://pycqa.github.io/isort/)


## C/I builds

Expand Down
3 changes: 3 additions & 0 deletions environment/cmake/LueConfiguration.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,10 @@ endif()


if(LUE_HPX_REQUIRED)
set(CMAKE_FIND_DEBUG_MODE TRUE)
message(STATUS "CMAKE_SIZEOF_VOID_P: ${CMAKE_SIZEOF_VOID_P}")
find_package(HPX 1.11...<1.12 REQUIRED)
set(CMAKE_FIND_DEBUG_MODE FALSE)

if(HPX_FOUND)
message(STATUS "Using HPX ${HPX_VERSION} found in ${HPX_PREFIX}")
Expand Down
Loading