Commit 7d7ff1cc authored by Yunus Sevinchan's avatar Yunus Sevinchan
Browse files

Merge branch '370-installation-issues-with-xcode-15' into 'master' 

Resolve "Installation issues with Xcode 15"

Closes #370

See merge request !305
parents a6c7fc6a 0f1180a4

.gitlab-ci.yml

+5 −1
Original line number Diff line number Diff line
@@ -336,6 +336,10 @@ test:models: 
  before_script:

    # Place a symlink at the expected path to make the model registry available

    - &add_cfg_symlink ln -s $CI_PROJECT_DIR/.config ~/.config && ls -la ~/

    #

    # Reduce number of steps for models to speed up CI

    - $ENTER_UTOPIA_ENV

    - utopia config user --set paramter_space.num_steps=10 --get

  script:

    # Test models using C++ and Python model tests

    - cd build
@@ -354,7 +358,7 @@ test:models: 


    # Now the actual models:

    - utopia run ContDisease --debug

    - utopia run Environment --debug -N 10

    - utopia run Environment --debug

    - utopia run ForestFire --debug

    - utopia run GameOfLife --debug

    - utopia run Geomorphology --debug

CMakeLists.txt

+9 −0
Original line number Diff line number Diff line
@@ -54,6 +54,15 @@ add_library(Utopia::utopia ALIAS utopia) 
# Require C++17 support

target_compile_features(utopia INTERFACE cxx_std_17)



# As of libgcc >= 15, some functions needed by boost are removed and it is not

# always correctly detected that an alternative needs to be used.

# Re-enable it for Utopia.

# See also:

#   https://developer.apple.com/documentation/xcode-release-notes/xcode-15-release-notes#Deprecations

target_compile_definitions(

    utopia INTERFACE _LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION

)



# Add include directories

target_include_directories(utopia INTERFACE

    $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include/>

doc/usage/implement/graph.rst

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ Using the ``complete`` graph generator, you can generate a complete (fully-conne 


Erdős-Rényi random graphs

**************************

The ``random`` model creates a random graph using the Erdös-Rényi model, in which all links have an equal probability of occuring. If you set the ``parallel`` key to ``false``, no multi-edges are added. Utopia uses the ``boost::generate_random_graph`` `algorithm <https://github.com/boostorg/graph/blob/35d3e15a47c58e7e933a69354033ecb48bce75aa/include/boost/graph/random.hpp#L208>`_.

The ``random`` model creates a random graph using the Erdös-Rényi model, in which all links have an equal probability of occuring. If you set the ``parallel`` key to ``false``, no multi-edges are added. Utopia uses the ``boost::generate_random_graph`` `algorithm <https://github.com/boostorg/graph/blob/master/include/boost/graph/random.hpp>`_.



Small-world Watts-Strogatz graphs

*********************************

python/model_plots/HdfBench/bench_plots.py

+4 −2
Original line number Diff line number Diff line
@@ -82,7 +82,9 @@ def times(dm: DataManager, *, uni: UniverseGroup, **kwargs): 
    times = uni["data/HdfBench/times"]



    # Use helper function for actual plot

    _plot_times(times=times, bench_names=times.coords["benchmark"], **kwargs)

    _plot_times(

        times=times, bench_names=times.coords["benchmark"].values, **kwargs

    )





# -----------------------------------------------------------------------------
@@ -124,7 +126,7 @@ def mean_times( 
    _plot_times(

        times=times_mean,

        std=times_std,

        bench_names=times.coords["benchmark"],

        bench_names=times.coords["benchmark"].values,

        num_seeds=times["seed"].shape[0],

        **kwargs,

    )

src/utopia/models/SandPile/SandPile_base_plots.yml

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ area_fraction: 
  # Need to adjust scatter points such that they don't have an edge

  marker: '.'

  alpha: .8

  edgecolors: none

  edgecolor: none

  linewidths: 0.



  # Adjust helpers