Merge remote-tracking branch 'origin/master' into knutel/doc_updates

Author: klingaard

.azure-pipelines/azure-pipelines-osx.yml

@@ -5,7 +5,7 @@
 jobs:
 - job: osx
   pool:
-    vmImage: macOS-12
+    vmImage: macOS-13
   strategy:
     matrix:
       osx_64_:

.ci_support/linux_64_.yaml

@@ -5,7 +5,7 @@ c_compiler:
 c_compiler_version:
 - '13'
 cdt_name:
-- cos7
+- conda
 channel_sources:
 - conda-forge
 channel_targets:
@@ -15,7 +15,7 @@ cxx_compiler:
 cxx_compiler_version:
 - '13'
 docker_image:
-- quay.io/condaforge/linux-anvil-cos7-x86_64
+- quay.io/condaforge/linux-anvil-x86_64:alma9
 hdf5:
 - 1.14.3
 linux_clang_version:

.ci_support/osx_64_.yaml

@@ -1,21 +1,21 @@
 MACOSX_DEPLOYMENT_TARGET:
-- '11.1'
+- '14.5'
 MACOSX_SDK_VERSION:
-- '11.1'
+- '14.5'
 boost:
 - '1.78'
 c_compiler:
 - clang
 c_compiler_version:
-- '17'
+- '18'
 channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '17'
+- '18'
 hdf5:
 - 1.14.3
 macos_machine:

.ci_support/osx_arm64_.yaml

@@ -1,21 +1,21 @@
 MACOSX_DEPLOYMENT_TARGET:
-- '11.1'
+- '14.5'
 MACOSX_SDK_VERSION:
-- '11.1'
+- '14.5'
 boost:
 - '1.78'
 c_compiler:
 - clang
 c_compiler_version:
-- '17'
+- '18'
 channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '17'
+- '18'
 hdf5:
 - 1.14.3
 macos_machine:

.circleci/config.yml

@@ -12,7 +12,7 @@ jobs:
     environment:
       - CONFIG: "linux_64_"
       - UPLOAD_PACKAGES: "False"
-        DOCKER_IMAGE: "quay.io/condaforge/linux-anvil-cos7-x86_64"
+        DOCKER_IMAGE: "quay.io/condaforge/linux-anvil-x86_64:alma9"
     steps:
       - checkout
       - run:

.scripts/build_steps.sh

@@ -31,18 +31,20 @@ pkgs_dirs:
 solver: libmamba
 
 CONDARC
+mv /opt/conda/conda-meta/history /opt/conda/conda-meta/history.$(date +%Y-%m-%d-%H-%M-%S)
+echo > /opt/conda/conda-meta/history
+micromamba install --root-prefix ~/.conda --prefix /opt/conda \
+    --yes --override-channels --channel conda-forge --strict-channel-priority \
+    pip  python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=24.1"
 export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1
 
-mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \
-    pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1"
-mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \
-    pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1"
-
 # set up the condarc
 setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}"
 
 source run_conda_forge_build_setup
 
+
+
 # make the build number clobber
 make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}"
 
@@ -71,8 +73,8 @@ else
         --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}"
     ( startgroup "Inspecting artifacts" ) 2> /dev/null
 
-    # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0
-    command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0"
+    # inspect_artifacts was only added in conda-forge-ci-setup 4.9.4
+    command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts --recipe-dir "${RECIPE_ROOT}" -m "${CONFIG_FILE}" || echo "inspect_artifacts needs conda-forge-ci-setup >=4.9.4"
 
     ( endgroup "Inspecting artifacts" ) 2> /dev/null
 

.scripts/run_osx_build.sh

@@ -7,28 +7,39 @@ source .scripts/logging_utils.sh
 set -xe
 
 MINIFORGE_HOME=${MINIFORGE_HOME:-${HOME}/miniforge3}
+MINIFORGE_HOME=${MINIFORGE_HOME%/} # remove trailing slash
 
-( startgroup "Installing a fresh version of Miniforge" ) 2> /dev/null
-
-MINIFORGE_URL="https://github.com/conda-forge/miniforge/releases/latest/download"
-MINIFORGE_FILE="Miniforge3-MacOSX-$(uname -m).sh"
-curl -L -O "${MINIFORGE_URL}/${MINIFORGE_FILE}"
-rm -rf ${MINIFORGE_HOME}
-bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME}
-
-( endgroup "Installing a fresh version of Miniforge" ) 2> /dev/null
+( startgroup "Provisioning base env with micromamba" ) 2> /dev/null
+MICROMAMBA_VERSION="1.5.10-0"
+if [[ "$(uname -m)" == "arm64" ]]; then
+  osx_arch="osx-arm64"
+else
+  osx_arch="osx-64"
+fi
+MICROMAMBA_URL="https://github.com/mamba-org/micromamba-releases/releases/download/${MICROMAMBA_VERSION}/micromamba-${osx_arch}"
+MAMBA_ROOT_PREFIX="${MINIFORGE_HOME}-micromamba-$(date +%s)"
+echo "Downloading micromamba ${MICROMAMBA_VERSION}"
+micromamba_exe="$(mktemp -d)/micromamba"
+curl -L -o "${micromamba_exe}" "${MICROMAMBA_URL}"
+chmod +x "${micromamba_exe}"
+echo "Creating environment"
+"${micromamba_exe}" create --yes --root-prefix "${MAMBA_ROOT_PREFIX}" --prefix "${MINIFORGE_HOME}" \
+  --channel conda-forge \
+  pip python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=24.1"
+echo "Moving pkgs cache from ${MAMBA_ROOT_PREFIX} to ${MINIFORGE_HOME}"
+mv "${MAMBA_ROOT_PREFIX}/pkgs" "${MINIFORGE_HOME}"
+echo "Cleaning up micromamba"
+rm -rf "${MAMBA_ROOT_PREFIX}" "${micromamba_exe}" || true
+( endgroup "Provisioning base env with micromamba" ) 2> /dev/null
 
 ( startgroup "Configuring conda" ) 2> /dev/null
-
-source ${MINIFORGE_HOME}/etc/profile.d/conda.sh
+echo "Activating environment"
+source "${MINIFORGE_HOME}/etc/profile.d/conda.sh"
 conda activate base
 export CONDA_SOLVER="libmamba"
 export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1
 
-mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \
-    pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1"
-mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \
-    pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1"
+
 
 
 
@@ -84,8 +95,8 @@ else
 
     ( startgroup "Inspecting artifacts" ) 2> /dev/null
 
-    # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0
-    command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0"
+    # inspect_artifacts was only added in conda-forge-ci-setup 4.9.4
+    command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts --recipe-dir ./conda.recipe -m ./.ci_support/${CONFIG}.yaml || echo "inspect_artifacts needs conda-forge-ci-setup >=4.9.4"
 
     ( endgroup "Inspecting artifacts" ) 2> /dev/null
 

azure-pipelines.yml

@@ -2,5 +2,30 @@
 # update the conda-forge.yml and/or the recipe/meta.yaml.
 # -*- mode: yaml -*-
 
-jobs:
-  - template: ./.azure-pipelines/azure-pipelines-osx.yml
+stages:
+- stage: Check
+  jobs:
+    - job: Skip
+      pool:
+        vmImage: 'ubuntu-22.04'
+      variables:
+        DECODE_PERCENTS: 'false'
+        RET: 'true'
+      steps:
+      - checkout: self
+        fetchDepth: '2'
+      - bash: |
+          git_log=`git log --max-count=1 --skip=1 --pretty=format:"%B" | tr "\n" " "`
+          echo "##vso[task.setvariable variable=log]$git_log"
+        displayName: Obtain commit message
+      - bash: echo "##vso[task.setvariable variable=RET]false"
+        condition: and(eq(variables['Build.Reason'], 'PullRequest'), or(contains(variables.log, '[skip azp]'), contains(variables.log, '[azp skip]'), contains(variables.log, '[skip ci]'), contains(variables.log, '[ci skip]')))
+        displayName: Skip build?
+      - bash: echo "##vso[task.setvariable variable=start_main;isOutput=true]$RET"
+        name: result
+        displayName: Export result
+- stage: Build
+  condition: and(succeeded(), eq(dependencies.Check.outputs['Skip.result.start_main'], 'true'))
+  dependsOn: Check
+  jobs:
+    - template: ./.azure-pipelines/azure-pipelines-osx.yml

conda.recipe/conda_build_config.yaml

@@ -25,7 +25,7 @@
 macos_machine:                 # [osx]
   - arm64-apple-darwin20.0.0   # [osx and arm64]
 MACOSX_DEPLOYMENT_TARGET:      # [osx]
-  - 11.1                       # [osx]
+  - 14.5                         # [osx]
 
 # linux_clang_version is not a part of zip_keys
 # from conda-forge, if you want to, you can

sparta/.gitignore

@@ -11,4 +11,5 @@ build*
 [Ff]ast[Dd]ebug*
 cmake-build-*
 *~
-compile_commands.json
+compile_commands.json
+.vscode

sparta/CMakeLists.txt

@@ -157,6 +157,15 @@ if (ENABLE_SANITIZERS)
     set (CMAKE_LINKER_FLAGS "${CMAKE_LINKER_FLAGS} -fno-omit-frame-pointer -fsanitize=address -fsanitize=undefined")
 endif ()
 
+set(CMAKE_CXX_FLAGS_PROFILE "-O3 -pg -g")
+if(DEFINED SPARTA_CXX_FLAGS_DEBUG AND SPARTA_CXX_FLAGS_DEBUG)
+  set(CMAKE_CXX_FLAGS_DEBUG "${SPARTA_CXX_FLAGS_DEBUG}")
+  message(STATUS "Using Sparta custom debug flags: ${CMAKE_CXX_FLAGS_DEBUG}")
+else()
+  set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g3")
+  message(STATUS "Using Sparta default debug flags: ${CMAKE_CXX_FLAGS_DEBUG}")
+endif()
+
 #
 # If we're using CONDA, we might be using the one suggested for
 # Sparta.  Need to use the llvm-ar found in the conda package to

sparta/sparta/events/EventNode.hpp

@@ -97,13 +97,42 @@ namespace sparta
         //! Get the scheduleable associated with this event node
         virtual Scheduleable & getScheduleable() = 0;
 
+        /**
+         * \brief Turn on/off auto precedence for this EvendNode
+         * \param participate Set to true [default] if the EventNode is to
+         *                    participate in auto precedence establishment
+         *                    in sparta::Unit
+         *
+         * In sparta::Unit, registered sparta::Event types and Ports will
+         * have auto precedence established between them if the user
+         * of sparta::Unit allows it to do so.  However, this might not
+         * be desired for some Events that are created by the modeler
+         * and internally bound before the sparta::Unit performs this
+         * setup.  Calling this method with participate set to false,
+         * will prevent the assertion that the EventNode is be being
+         * registered after port binding.
+         */
+        virtual void participateInAutoPrecedence(bool participate) {
+            participate_in_auto_precedence_ = participate;
+        }
+
+        //! \brief Does this EventNode participate in auto-precedence
+        //!        establishment by sparta::Unit?
+        //! \return true if so, false otherwise
+        virtual bool doesParticipateInAutoPrecedence() const {
+            return participate_in_auto_precedence_;
+        }
+
     private:
 
         //! Make sure the parent is an EventNodeSet
         void ensureParentIsEventSet_(sparta::TreeNode* parent);
 
         //! Scheduling phase of this node
         const sparta::SchedulingPhase sched_phase_;
+
+        //! Does this EventNode participate in auto precedence?
+        bool participate_in_auto_precedence_ = true;
     };
 }