From 43bff70ce3ddf980c0dbb900b816c98971ec7f13 Mon Sep 17 00:00:00 2001
From: "Ambalu, Robert" <robert.ambalu@point72.com>
Date: Sun, 3 Mar 2024 15:23:03 -0500
Subject: [PATCH 01/21] fixes #83 - code updates to support clang compilation /
 cleaned up some clang warnings

Signed-off-by: Ambalu, Robert <robert.ambalu@point72.com>
---
 CMakeLists.txt                                |  6 +-
 .../parquet/ArrowSingleColumnArrayBuilder.h   |  2 +-
 .../adapters/parquet/ParquetOutputAdapter.h   |  2 +
 cpp/csp/adapters/parquet/ParquetReader.h      |  2 +-
 .../parquet/ParquetReaderColumnAdapter.h      |  5 +-
 cpp/csp/adapters/utils/JSONMessageWriter.h    |  2 +-
 cpp/csp/cppnodes/statsimpl.h                  |  2 +-
 cpp/csp/engine/CppNode.h                      |  8 +-
 cpp/csp/engine/CspType.h                      | 85 ++++++++++---------
 cpp/csp/engine/DynamicEngine.h                |  2 +-
 cpp/csp/engine/Feedback.h                     |  2 +-
 cpp/csp/engine/PendingPushEvents.h            |  2 +-
 cpp/csp/engine/RootEngine.h                   |  1 +
 cpp/csp/engine/Struct.h                       |  6 +-
 cpp/csp/python/InitHelper.h                   |  2 +-
 cpp/csp/python/PyCspType.h                    |  4 +-
 .../python/adapters/parquetadapterimpl.cpp    | 17 ++--
 cpp/csp/python/cspbaselibimpl.cpp             |  2 +-
 cpp/csp/python/cspimpl.cpp                    |  2 +-
 19 files changed, 78 insertions(+), 76 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f29413280..1b820a0ea 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -230,9 +230,13 @@ else()
         -Wall \
         -Wno-deprecated-declarations \
         -Wno-deprecated \
-        -Wno-maybe-uninitialized \
         ")
         add_definitions(-DNDEBUG)
+        if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
+            -Wno-maybe-uninitialized \
+            ")
+        endif()
     endif()
 endif()
 
diff --git a/cpp/csp/adapters/parquet/ArrowSingleColumnArrayBuilder.h b/cpp/csp/adapters/parquet/ArrowSingleColumnArrayBuilder.h
index c998d4518..136ef7027 100644
--- a/cpp/csp/adapters/parquet/ArrowSingleColumnArrayBuilder.h
+++ b/cpp/csp/adapters/parquet/ArrowSingleColumnArrayBuilder.h
@@ -304,7 +304,7 @@ class PrimitiveTypedArrayBuilder : public BaseTypedArrayBuilder<ValueType, Arrow
 protected:
     void pushValueToArray()
     {
-        this -> m_builderPtr -> Append( *this -> m_value );
+        [[maybe_unused]] auto status = this -> m_builderPtr -> Append( *this -> m_value );        
     }
 };
 
diff --git a/cpp/csp/adapters/parquet/ParquetOutputAdapter.h b/cpp/csp/adapters/parquet/ParquetOutputAdapter.h
index 842b3c136..7148d0fa9 100644
--- a/cpp/csp/adapters/parquet/ParquetOutputAdapter.h
+++ b/cpp/csp/adapters/parquet/ParquetOutputAdapter.h
@@ -31,6 +31,8 @@ class ParquetOutputHandler
     {
     }
 
+    virtual ~ParquetOutputHandler() {}
+
     uint32_t getChunkSize() const;
 
     virtual uint32_t getNumColumns() = 0;
diff --git a/cpp/csp/adapters/parquet/ParquetReader.h b/cpp/csp/adapters/parquet/ParquetReader.h
index 1026090e2..c10923bc0 100644
--- a/cpp/csp/adapters/parquet/ParquetReader.h
+++ b/cpp/csp/adapters/parquet/ParquetReader.h
@@ -376,7 +376,7 @@ class SingleTableParquetReader : public ParquetReader
                                     const std::optional<utils::Symbol> &symbol, const DialectGenericListReaderInterface::Ptr &listReaderInterface ) override
     {
         ParquetReader::addListSubscriber( column, inputAdapter, symbol, listReaderInterface);
-        m_columnSubscriptionContainer.m_listColumnSubscriptions[column].push_back(ListColumnSubscriberInfo{inputAdapter, symbol, listReaderInterface});
+        m_columnSubscriptionContainer.m_listColumnSubscriptions[column].push_back(ListColumnSubscriberInfo{{inputAdapter, symbol}, listReaderInterface});
     }
 
 protected:
diff --git a/cpp/csp/adapters/parquet/ParquetReaderColumnAdapter.h b/cpp/csp/adapters/parquet/ParquetReaderColumnAdapter.h
index 6623a4675..eb7c4a839 100644
--- a/cpp/csp/adapters/parquet/ParquetReaderColumnAdapter.h
+++ b/cpp/csp/adapters/parquet/ParquetReaderColumnAdapter.h
@@ -134,7 +134,7 @@ class MissingColumnAdapter : public ParquetColumnAdapter
 
     bool isMissingColumn() const override{ return true; }
 
-    virtual CspTypePtr getNativeCspType() const
+    virtual CspTypePtr getNativeCspType() const override
     {
         CSP_THROW( csp::RuntimeException, "Trying to get native type of a missing column " << getColumnName() );
     }
@@ -190,8 +190,7 @@ template< typename ValueType, typename ArrowArrayType >
 class NativeTypeColumnAdapter : public BaseTypedColumnAdapter<ValueType, ArrowArrayType>
 {
 public:
-    using BASE = BaseTypedColumnAdapter<ValueType, ArrowArrayType>;
-    using BASE::BaseTypedColumnAdapter;
+    using BaseTypedColumnAdapter<ValueType, ArrowArrayType>::BaseTypedColumnAdapter;
     virtual CspTypePtr getNativeCspType() const override {return CspType::fromCType<ValueType>::type();}
 
 protected:
diff --git a/cpp/csp/adapters/utils/JSONMessageWriter.h b/cpp/csp/adapters/utils/JSONMessageWriter.h
index fc5902bbd..45c0c0aa4 100644
--- a/cpp/csp/adapters/utils/JSONMessageWriter.h
+++ b/cpp/csp/adapters/utils/JSONMessageWriter.h
@@ -63,7 +63,7 @@ class JSONMessageWriter : public MessageWriter
     }
 
 private:
-    void processTickImpl( const OutputDataMapper & dataMapper, const TimeSeriesProvider * sourcets )
+    void processTickImpl( const OutputDataMapper & dataMapper, const TimeSeriesProvider * sourcets ) override
     {
         dataMapper.apply( *this, sourcets );
     }
diff --git a/cpp/csp/cppnodes/statsimpl.h b/cpp/csp/cppnodes/statsimpl.h
index 88926d6b6..765b3aac2 100644
--- a/cpp/csp/cppnodes/statsimpl.h
+++ b/cpp/csp/cppnodes/statsimpl.h
@@ -1163,7 +1163,7 @@ class Quantile
             int ft = floor( target );
             int ct = ceil( target );
 
-            double qtl;
+            double qtl = 0.0;
         #ifndef __clang__
             switch ( m_interpolation )
             {
diff --git a/cpp/csp/engine/CppNode.h b/cpp/csp/engine/CppNode.h
index 75457a366..554b0695a 100644
--- a/cpp/csp/engine/CppNode.h
+++ b/cpp/csp/engine/CppNode.h
@@ -161,9 +161,9 @@ class CppNode : public csp::Node
         using InputWrapper::InputWrapper;
 
         operator const T &() { return lastValue(); }
-        const T & lastValue() const { return ts() -> lastValueTyped<T>(); }
+        const T & lastValue() const { return ts() -> template lastValueTyped<T>(); }
 
-        const T & valueAtIndex( int32_t index ) const { return ts() -> valueAtIndex<T>( index ); }
+        const T & valueAtIndex( int32_t index ) const { return ts() -> template valueAtIndex<T>( index ); }
     };
 
     template<typename ElemWrapperT>
@@ -379,7 +379,7 @@ class CppNode : public csp::Node
 
         T & reserveSpace()
         {
-            return ts() -> reserveTickTyped<T>( m_node.cycleCount(), m_node.now() );
+            return ts() -> template reserveTickTyped<T>( m_node.cycleCount(), m_node.now() );
         }
     };
 
@@ -644,7 +644,7 @@ struct csp::CppNode::AlarmTypeHelper<csp::CppNode::Generic>
     }
 
 #define INIT_CPPNODE_WITH_NAME( Class, Name )       \
-    CSP csp; \
+    [[maybe_unused]] CSP csp; \
 public:                                                      \
     const char * name() const override { return #Name; } \
     _STATIC_CREATE_METHOD( Class ) \
diff --git a/cpp/csp/engine/CspType.h b/cpp/csp/engine/CspType.h
index 7a0017fd4..a0b4f9eba 100644
--- a/cpp/csp/engine/CspType.h
+++ b/cpp/csp/engine/CspType.h
@@ -169,47 +169,50 @@ class CspArrayType : public CspType
     CspTypePtr m_elemType;
 };
 
-template<> struct CspType::Type::fromCType<std::_Bit_reference>      { static constexpr CspType::Type type = CspType::Type::BOOL;            };
-template<> struct CspType::Type::fromCType<bool>                     { static constexpr CspType::Type type = CspType::Type::BOOL;            };
-template<> struct CspType::Type::fromCType<int8_t>                   { static constexpr CspType::Type type = CspType::Type::INT8;            };
-template<> struct CspType::Type::fromCType<uint8_t>                  { static constexpr CspType::Type type = CspType::Type::UINT8;           };
-template<> struct CspType::Type::fromCType<int16_t>                  { static constexpr CspType::Type type = CspType::Type::INT16;           };
-template<> struct CspType::Type::fromCType<uint16_t>                 { static constexpr CspType::Type type = CspType::Type::UINT16;          };
-template<> struct CspType::Type::fromCType<int32_t>                  { static constexpr CspType::Type type = CspType::Type::INT32;           };
-template<> struct CspType::Type::fromCType<uint32_t>                 { static constexpr CspType::Type type = CspType::Type::UINT32;          };
-template<> struct CspType::Type::fromCType<int64_t>                  { static constexpr CspType::Type type = CspType::Type::INT64;           };
-template<> struct CspType::Type::fromCType<uint64_t>                 { static constexpr CspType::Type type = CspType::Type::UINT64;          };
-template<> struct CspType::Type::fromCType<double>                   { static constexpr CspType::Type type = CspType::Type::DOUBLE;          };
-template<> struct CspType::Type::fromCType<DateTime>                 { static constexpr CspType::Type type = CspType::Type::DATETIME;        };
-template<> struct CspType::Type::fromCType<TimeDelta>                { static constexpr CspType::Type type = CspType::Type::TIMEDELTA;       };
-template<> struct CspType::Type::fromCType<Date>                     { static constexpr CspType::Type type = CspType::Type::DATE;            };
-template<> struct CspType::Type::fromCType<Time>                     { static constexpr CspType::Type type = CspType::Type::TIME;            };
-template<> struct CspType::Type::fromCType<CspEnum>                  { static constexpr CspType::Type type = CspType::Type::ENUM;            };
-template<> struct CspType::Type::fromCType<CspType::StringCType>     { static constexpr CspType::Type type = CspType::Type::STRING;          };
-template<> struct CspType::Type::fromCType<StructPtr>                { static constexpr CspType::Type type = CspType::Type::STRUCT;          };
-template<typename T> struct CspType::Type::fromCType<TypedStructPtr<T>> { static constexpr CspType::Type type = CspType::Type::STRUCT;       };
-template<> struct CspType::Type::fromCType<DialectGenericType>       { static constexpr CspType::Type type = CspType::Type::DIALECT_GENERIC; };
-template<typename T> struct CspType::Type::fromCType<std::vector<T>> { static constexpr CspType::Type type = CspType::Type::ARRAY; };
-
-template<> struct CspType::Type::toCType<CspType::Type::BOOL,void>            { using type = bool;      };
-template<> struct CspType::Type::toCType<CspType::Type::INT8,void>            { using type = int8_t;    };
-template<> struct CspType::Type::toCType<CspType::Type::UINT8,void>           { using type = uint8_t;   };
-template<> struct CspType::Type::toCType<CspType::Type::INT16,void>           { using type = int16_t;   };
-template<> struct CspType::Type::toCType<CspType::Type::UINT16,void>          { using type = uint16_t;  };
-template<> struct CspType::Type::toCType<CspType::Type::INT32,void>           { using type = int32_t;   };
-template<> struct CspType::Type::toCType<CspType::Type::UINT32,void>          { using type = uint32_t;  };
-template<> struct CspType::Type::toCType<CspType::Type::INT64,void>           { using type = int64_t;   };
-template<> struct CspType::Type::toCType<CspType::Type::UINT64,void>          { using type = uint64_t;  };
-template<> struct CspType::Type::toCType<CspType::Type::DOUBLE,void>          { using type = double;    };
-template<> struct CspType::Type::toCType<CspType::Type::DATETIME,void>        { using type = DateTime;  };
-template<> struct CspType::Type::toCType<CspType::Type::TIMEDELTA,void>       { using type = TimeDelta; };
-template<> struct CspType::Type::toCType<CspType::Type::DATE,void>            { using type = Date; };
-template<> struct CspType::Type::toCType<CspType::Type::TIME,void>            { using type = Time; };
-template<> struct CspType::Type::toCType<CspType::Type::ENUM,void>            { using type = CspEnum; };
-template<> struct CspType::Type::toCType<CspType::Type::STRING,void>          { using type = CspType::StringCType; };
-template<> struct CspType::Type::toCType<CspType::Type::STRUCT,void>          { using type = StructPtr; };
-template<> struct CspType::Type::toCType<CspType::Type::DIALECT_GENERIC,void> { using type = DialectGenericType; };
-template<typename T> struct CspType::Type::toCType<CspType::Type::ARRAY,T> { using type = std::vector<T>; };
+#ifndef __clang__
+template<> struct CspType::Type::fromCType<std::_Bit_reference>            { static constexpr CspType::Type type = CspType::Type::BOOL; };
+#endif
+
+template<> struct CspType::TypeTraits::fromCType<bool>                     { static constexpr CspType::TypeTraits::_enum type = CspType::TypeTraits::BOOL;            };
+template<> struct CspType::TypeTraits::fromCType<int8_t>                   { static constexpr CspType::TypeTraits::_enum type = CspType::TypeTraits::INT8;            };
+template<> struct CspType::TypeTraits::fromCType<uint8_t>                  { static constexpr CspType::TypeTraits::_enum type = CspType::TypeTraits::UINT8;           };
+template<> struct CspType::TypeTraits::fromCType<int16_t>                  { static constexpr CspType::TypeTraits::_enum type = CspType::TypeTraits::INT16;           };
+template<> struct CspType::TypeTraits::fromCType<uint16_t>                 { static constexpr CspType::TypeTraits::_enum type = CspType::TypeTraits::UINT16;          };
+template<> struct CspType::TypeTraits::fromCType<int32_t>                  { static constexpr CspType::TypeTraits::_enum type = CspType::TypeTraits::INT32;           };
+template<> struct CspType::TypeTraits::fromCType<uint32_t>                 { static constexpr CspType::TypeTraits::_enum type = CspType::TypeTraits::UINT32;          };
+template<> struct CspType::TypeTraits::fromCType<int64_t>                  { static constexpr CspType::TypeTraits::_enum type = CspType::TypeTraits::INT64;           };
+template<> struct CspType::TypeTraits::fromCType<uint64_t>                 { static constexpr CspType::TypeTraits::_enum type = CspType::TypeTraits::UINT64;          };
+template<> struct CspType::TypeTraits::fromCType<double>                   { static constexpr CspType::TypeTraits::_enum type = CspType::TypeTraits::DOUBLE;          };
+template<> struct CspType::TypeTraits::fromCType<DateTime>                 { static constexpr CspType::TypeTraits::_enum type = CspType::TypeTraits::DATETIME;        };
+template<> struct CspType::TypeTraits::fromCType<TimeDelta>                { static constexpr CspType::TypeTraits::_enum type = CspType::TypeTraits::TIMEDELTA;       };
+template<> struct CspType::TypeTraits::fromCType<Date>                     { static constexpr CspType::TypeTraits::_enum type = CspType::TypeTraits::DATE;            };
+template<> struct CspType::TypeTraits::fromCType<Time>                     { static constexpr CspType::TypeTraits::_enum type = CspType::TypeTraits::TIME;            };
+template<> struct CspType::TypeTraits::fromCType<CspEnum>                  { static constexpr CspType::TypeTraits::_enum type = CspType::TypeTraits::ENUM;            };
+template<> struct CspType::TypeTraits::fromCType<CspType::StringCType>     { static constexpr CspType::TypeTraits::_enum type = CspType::TypeTraits::STRING;          };
+template<> struct CspType::TypeTraits::fromCType<StructPtr>                { static constexpr CspType::TypeTraits::_enum type = CspType::TypeTraits::STRUCT;          };
+template<typename T> struct CspType::TypeTraits::fromCType<TypedStructPtr<T>> { static constexpr CspType::TypeTraits::_enum type = CspType::TypeTraits::STRUCT;       };
+template<> struct CspType::TypeTraits::fromCType<DialectGenericType>       { static constexpr CspType::TypeTraits::_enum type = CspType::TypeTraits::DIALECT_GENERIC; };
+template<typename T> struct CspType::TypeTraits::fromCType<std::vector<T>> { static constexpr CspType::TypeTraits::_enum type = CspType::TypeTraits::ARRAY; };
+
+template<> struct CspType::TypeTraits::toCType<CspType::TypeTraits::BOOL,void>            { using type = bool;      };
+template<> struct CspType::TypeTraits::toCType<CspType::TypeTraits::INT8,void>            { using type = int8_t;    };
+template<> struct CspType::TypeTraits::toCType<CspType::TypeTraits::UINT8,void>           { using type = uint8_t;   };
+template<> struct CspType::TypeTraits::toCType<CspType::TypeTraits::INT16,void>           { using type = int16_t;   };
+template<> struct CspType::TypeTraits::toCType<CspType::TypeTraits::UINT16,void>          { using type = uint16_t;  };
+template<> struct CspType::TypeTraits::toCType<CspType::TypeTraits::INT32,void>           { using type = int32_t;   };
+template<> struct CspType::TypeTraits::toCType<CspType::TypeTraits::UINT32,void>          { using type = uint32_t;  };
+template<> struct CspType::TypeTraits::toCType<CspType::TypeTraits::INT64,void>           { using type = int64_t;   };
+template<> struct CspType::TypeTraits::toCType<CspType::TypeTraits::UINT64,void>          { using type = uint64_t;  };
+template<> struct CspType::TypeTraits::toCType<CspType::TypeTraits::DOUBLE,void>          { using type = double;    };
+template<> struct CspType::TypeTraits::toCType<CspType::TypeTraits::DATETIME,void>        { using type = DateTime;  };
+template<> struct CspType::TypeTraits::toCType<CspType::TypeTraits::TIMEDELTA,void>       { using type = TimeDelta; };
+template<> struct CspType::TypeTraits::toCType<CspType::TypeTraits::DATE,void>            { using type = Date; };
+template<> struct CspType::TypeTraits::toCType<CspType::TypeTraits::TIME,void>            { using type = Time; };
+template<> struct CspType::TypeTraits::toCType<CspType::TypeTraits::ENUM,void>            { using type = CspEnum; };
+template<> struct CspType::TypeTraits::toCType<CspType::TypeTraits::STRING,void>          { using type = CspType::StringCType; };
+template<> struct CspType::TypeTraits::toCType<CspType::TypeTraits::STRUCT,void>          { using type = StructPtr; };
+template<> struct CspType::TypeTraits::toCType<CspType::TypeTraits::DIALECT_GENERIC,void> { using type = DialectGenericType; };
+template<typename T> struct CspType::TypeTraits::toCType<CspType::TypeTraits::ARRAY,T> { using type = std::vector<T>; };
 
 template<> struct CspType::fromCType<bool>                 { static CspTypePtr & type() { return CspType::BOOL();      } };
 template<> struct CspType::fromCType<int8_t>               { static CspTypePtr & type() { return CspType::INT8();      } };
diff --git a/cpp/csp/engine/DynamicEngine.h b/cpp/csp/engine/DynamicEngine.h
index 714a79f4f..e45392c6d 100644
--- a/cpp/csp/engine/DynamicEngine.h
+++ b/cpp/csp/engine/DynamicEngine.h
@@ -1,5 +1,5 @@
 #ifndef _IN_CSP_ENGINE_DYNAMICENGINE_H
-#define _IN_CSP_ENGINE_DUNAMICENGINE_H
+#define _IN_CSP_ENGINE_DYNAMICENGINE_H
 
 #include <csp/engine/Engine.h>
 #include <csp/engine/OutputAdapter.h>
diff --git a/cpp/csp/engine/Feedback.h b/cpp/csp/engine/Feedback.h
index fd0678d2d..0194d9257 100644
--- a/cpp/csp/engine/Feedback.h
+++ b/cpp/csp/engine/Feedback.h
@@ -62,7 +62,7 @@ inline FeedbackOutputAdapter<T>::FeedbackOutputAdapter( csp::Engine * engine,
 template<typename T>
 inline void FeedbackOutputAdapter<T>::executeImpl()
 {
-    m_boundInput -> pushTick( input() -> lastValueTyped<T>() );
+    m_boundInput -> pushTick( input() -> template lastValueTyped<T>() );
 }
 
 }
diff --git a/cpp/csp/engine/PendingPushEvents.h b/cpp/csp/engine/PendingPushEvents.h
index 803424eae..5036e7fd2 100644
--- a/cpp/csp/engine/PendingPushEvents.h
+++ b/cpp/csp/engine/PendingPushEvents.h
@@ -7,7 +7,7 @@
 namespace csp
 {
 
-class PushGroup;
+struct PushGroup;
 class PushInputAdapters;
 
 class PendingPushEvents
diff --git a/cpp/csp/engine/RootEngine.h b/cpp/csp/engine/RootEngine.h
index 8b8c34167..e3999d572 100644
--- a/cpp/csp/engine/RootEngine.h
+++ b/cpp/csp/engine/RootEngine.h
@@ -22,6 +22,7 @@ class Dictionary;
 class EndCycleListener
 {
 public:
+    virtual ~EndCycleListener() {};
     virtual void onEndCycle() = 0;
     
     bool isDirty() const  { return m_dirty; }
diff --git a/cpp/csp/engine/Struct.h b/cpp/csp/engine/Struct.h
index 7b3464b36..67ee840bd 100644
--- a/cpp/csp/engine/Struct.h
+++ b/cpp/csp/engine/Struct.h
@@ -263,17 +263,17 @@ class StringStructField final : public NonNativeStructField
         setIsSet( s );
     }
 
-    virtual void copyFrom( const Struct * src, Struct * dest ) const
+    virtual void copyFrom( const Struct * src, Struct * dest ) const override
     {
         value( dest ) = value( src );
     }
 
-    virtual bool isEqual( const Struct * x, const Struct * y ) const
+    virtual bool isEqual( const Struct * x, const Struct * y ) const override
     {
         return value( x ) == value( y );
     }
 
-    virtual size_t hash( const Struct * x ) const
+    virtual size_t hash( const Struct * x ) const override
     {
         return std::hash<CType>()( value( x ) );
     }
diff --git a/cpp/csp/python/InitHelper.h b/cpp/csp/python/InitHelper.h
index 419c319bc..3023919ec 100644
--- a/cpp/csp/python/InitHelper.h
+++ b/cpp/csp/python/InitHelper.h
@@ -77,7 +77,7 @@ inline InitHelper::InitCallback InitHelper::moduleMethodsCallback( PyMethodDef *
 
 inline InitHelper::InitCallback InitHelper::moduleMethod( const char * name, PyCFunction func, int flags, const char * doc )
 {
-    PyMethodDef defs[2]{ { name, func, flags, doc }, nullptr };
+    PyMethodDef defs[2]{ { name, func, flags, doc }, { nullptr } };
 
     //Note that we rely on the lambda closure to keep the lifetime of defs which is kept by ptr
     //m_callbacks will keep the InitCallback around for the life of the program
diff --git a/cpp/csp/python/PyCspType.h b/cpp/csp/python/PyCspType.h
index e71da4061..bb53ac3c7 100644
--- a/cpp/csp/python/PyCspType.h
+++ b/cpp/csp/python/PyCspType.h
@@ -12,9 +12,9 @@ static_assert( alignof( csp::DialectGenericType ) == alignof( csp::python::PyObj
 namespace csp
 {
 template<>
-struct CspType::Type::fromCType<csp::python::PyObjectPtr>
+struct CspType::TypeTraits::fromCType<csp::python::PyObjectPtr>
 {
-    static constexpr csp::CspType::Type type = csp::CspType::Type::DIALECT_GENERIC;
+    static constexpr csp::CspType::TypeTraits::_enum type = csp::CspType::TypeTraits::DIALECT_GENERIC;
 };
 
 }
diff --git a/cpp/csp/python/adapters/parquetadapterimpl.cpp b/cpp/csp/python/adapters/parquetadapterimpl.cpp
index 8c7ecf84b..6c0234a4c 100644
--- a/cpp/csp/python/adapters/parquetadapterimpl.cpp
+++ b/cpp/csp/python/adapters/parquetadapterimpl.cpp
@@ -253,8 +253,7 @@ class NumpyArrayWriterImpl : public TypedDialectGenericListWriterInterface<V>
 class NumpyUnicodeArrayWriter : public TypedDialectGenericListWriterInterface<std::string>
 {
 public:
-    NumpyUnicodeArrayWriter( PyArray_Descr *expectedArrayDesc )
-            : m_expectedArrayDesc( expectedArrayDesc )
+    NumpyUnicodeArrayWriter()
     {
     }
 
@@ -327,8 +326,7 @@ static inline DialectGenericListWriterInterface::Ptr create_numpy_array_writer_i
 
                     if( numpy_dtype -> type_num == NPY_UNICODE )
                     {
-                        return std::make_shared<NumpyUnicodeArrayWriter>(
-                                numpy_dtype );
+                        return std::make_shared<NumpyUnicodeArrayWriter>();
                     }
                     else
                     {
@@ -380,7 +378,7 @@ class NumpyArrayReaderImpl final : public TypedDialectGenericListReaderInterface
         return reinterpret_cast<V *>(PyArray_DATA( arrayObject ));
     }
 
-    virtual void setValue(const csp::DialectGenericType& list, int index, const V& value)
+    virtual void setValue(const csp::DialectGenericType& list, int index, const V& value) override
     {
         getRawDataBuffer(list)[index] = value;
     }
@@ -392,8 +390,7 @@ class NumpyArrayReaderImpl final : public TypedDialectGenericListReaderInterface
 class NumpyUnicodeReaderImpl final : public TypedDialectGenericListReaderInterface<std::string>
 {
 public:
-    NumpyUnicodeReaderImpl( PyArray_Descr *expectedArrayDesc )
-            : m_expectedArrayDesc( expectedArrayDesc )
+    NumpyUnicodeReaderImpl()
     {
     }
 
@@ -434,9 +431,6 @@ class NumpyUnicodeReaderImpl final : public TypedDialectGenericListReaderInterfa
         auto nElementsToCopy = std::min( int(elementSize / sizeof(wchar_t)), int( wideValue.size() + 1 ) );
         std::copy_n( wideValue.c_str(), nElementsToCopy, reinterpret_cast<wchar_t *>(PyArray_GETPTR1( arrayObject, index )) );
     }
-
-private:
-    PyArray_Descr *m_expectedArrayDesc;
 };
 
 
@@ -455,8 +449,7 @@ inline DialectGenericListReaderInterface::Ptr create_numpy_array_reader_impl( co
 
                                                                                    if( numpy_dtype -> type_num == NPY_UNICODE )
                                                                                    {
-                                                                                       return std::make_shared<NumpyUnicodeReaderImpl>(
-                                                                                               numpy_dtype );
+                                                                                       return std::make_shared<NumpyUnicodeReaderImpl>();
                                                                                    }
                                                                                    else
                                                                                    {
diff --git a/cpp/csp/python/cspbaselibimpl.cpp b/cpp/csp/python/cspbaselibimpl.cpp
index c34351e9f..039fb8134 100644
--- a/cpp/csp/python/cspbaselibimpl.cpp
+++ b/cpp/csp/python/cspbaselibimpl.cpp
@@ -170,7 +170,7 @@ DECLARE_CPPNODE( exprtk_impl )
             {
                 PartialSwitchCspType<CspType::Type::STRING, CspType::Type::DOUBLE>::invoke(
                         typ,
-                        [ this, &inputName ]( auto tag )
+                        [ this ]( auto tag )
                         {
                             s_valuesContainer.push_back( std::make_unique<ValueContainer<typename decltype(tag)::type>>() );
                         } );
diff --git a/cpp/csp/python/cspimpl.cpp b/cpp/csp/python/cspimpl.cpp
index 1b362455d..8527aeb6d 100644
--- a/cpp/csp/python/cspimpl.cpp
+++ b/cpp/csp/python/cspimpl.cpp
@@ -124,7 +124,7 @@ static PyMethodDef _cspimpl_methods[] = {
     {"create_traceback",            (PyCFunction) _create_traceback,          METH_VARARGS,   "internal"},
     {"_csp_engine_stats",           (PyCFunction) _engine_stats,              METH_O, "engine statistics"},
     {"set_capture_cpp_backtrace",   (PyCFunction) _set_capture_cpp_backtrace, METH_VARARGS,   "internal"},
-    nullptr
+    {nullptr}
 };
 
 static PyModuleDef _cspimpl_module = {

From 7170f720fb8aca1d0b8ac3e04ab63066f93bbb5f Mon Sep 17 00:00:00 2001
From: Rob Ambalu <robert.ambalu@point72.com>
Date: Mon, 18 Mar 2024 16:56:47 -0400
Subject: [PATCH 02/21] fixes #132 - final touches, all tests pass.  Note this
 had to comment out the --arch options in CMakeLists.txt, not sure what the
 implications are

Signed-off-by: Rob Ambalu <robert.ambalu@point72.com>
---
 CMakeLists.txt                     | 21 +++++++++------------
 cpp/csp/engine/CspType.h           |  2 +-
 cpp/csp/engine/Struct.h            |  8 ++++----
 csp/adapters/parquet.py            |  4 ----
 csp/tests/adapters/test_parquet.py |  3 ---
 csp/tests/test_engine.py           |  2 +-
 6 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cf4fb29e2..ace0d7051 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -135,15 +135,15 @@ if(MACOS)
     check_c_compiler_flag("-arch x86_64" x86_64Supported)
     check_c_compiler_flag("-arch arm64" arm64Supported)
 
-    if(x86_64Supported AND arm64Supported)
-        set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64" CACHE STRING "Build universal architecture for OSX" FORCE)
-    elseif(x86_64Supported)
-        set(CMAKE_REQUIRED_LINK_OPTIONS "-arch;x86_64")
-        set(CMAKE_OSX_ARCHITECTURES "x86_64" CACHE STRING "Build universal architecture for OSX" FORCE)
-    elseif(arm64Supported)
+    #if(x86_64Supported AND arm64Supported)
+    #    set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64" CACHE STRING "Build universal architecture for OSX" FORCE)
+    #elseif(x86_64Supported)
+    #    set(CMAKE_REQUIRED_LINK_OPTIONS "-arch;x86_64")
+    #    set(CMAKE_OSX_ARCHITECTURES "x86_64" CACHE STRING "Build universal architecture for OSX" FORCE)
+    #elseif(arm64Supported)
         set(CMAKE_REQUIRED_LINK_OPTIONS "-arch;arm64")
         set(CMAKE_OSX_ARCHITECTURES "arm64" CACHE STRING "Build universal architecture for OSX" FORCE)
-    endif()
+    #endif()
 endif()
 
 
@@ -170,7 +170,7 @@ endif()
 # RPath #
 #########
 if(MACOS)
-    set(CMAKE_INSTALL_RPATH "@loader_path/:@loader_path/../lib")
+    set(CMAKE_INSTALL_RPATH "@loader_path/")
 elseif(LINUX)
     set(CMAKE_INSTALL_RPATH "\$ORIGIN:\$ORIGIN/../lib")
 endif()
@@ -179,10 +179,7 @@ endif()
 # Flags #
 #########
 # Compiler version flags
-if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
-endif()
-
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
 
 # Optimization Flags
 if(WIN32)
diff --git a/cpp/csp/engine/CspType.h b/cpp/csp/engine/CspType.h
index ff94bbc0a..225dc958b 100644
--- a/cpp/csp/engine/CspType.h
+++ b/cpp/csp/engine/CspType.h
@@ -102,7 +102,7 @@ class CspType
     static Ptr & BYTES();
     static Ptr & DIALECT_GENERIC() { static auto s_type = std::make_shared<const CspType>( Type::DIALECT_GENERIC ); return s_type; }
 
-    static constexpr bool isNative( Type t ) { return t <= Type::MAX_NATIVE_TYPE; }
+    static constexpr bool isNative( TypeTraits::_enum t ) { return t <= TypeTraits::MAX_NATIVE_TYPE; }
 
     bool isNative() const { return isNative( m_type ); }
 
diff --git a/cpp/csp/engine/Struct.h b/cpp/csp/engine/Struct.h
index e43ed2173..0cd83762f 100644
--- a/cpp/csp/engine/Struct.h
+++ b/cpp/csp/engine/Struct.h
@@ -319,7 +319,7 @@ class ArrayStructField : public NonNativeStructField
     {
         dest = src;
     }
-
+        
     static void deepcopy( const std::vector<std::string> & src, std::vector<std::string> & dest )
     {
         dest = src;
@@ -368,7 +368,7 @@ class ArrayStructField : public NonNativeStructField
 
     void deepcopyFrom( const Struct * src, Struct * dest ) const override
     {
-        //deepcopy( value( src ), value( dest ) );
+        deepcopy( value( src ), value( dest ) );
     }
     
     bool isEqual( const Struct * x, const Struct * y ) const override
@@ -872,8 +872,8 @@ class StructStructField final : public NonNativeStructField
 };
 
 //Defined here to break decl dep
-template<typename CType>
-void ArrayStructField<CType>::deepcopy( const std::vector<StructPtr> & src, std::vector<StructPtr> & dest )
+template<typename ElemT>
+void ArrayStructField<ElemT>::deepcopy( const std::vector<StructPtr> & src, std::vector<StructPtr> & dest )
 {
     dest.resize( src.size() );
     for( size_t i = 0; i < src.size(); ++i )
diff --git a/csp/adapters/parquet.py b/csp/adapters/parquet.py
index 85e457ee0..e88fcfeaa 100644
--- a/csp/adapters/parquet.py
+++ b/csp/adapters/parquet.py
@@ -1,7 +1,6 @@
 import datetime
 import io
 import numpy
-import platform
 import pyarrow
 import pyarrow.parquet
 from importlib.metadata import PackageNotFoundError, version as get_package_version
@@ -101,9 +100,6 @@ def __init__(
             self._properties["tz"] = tz.zone
         if binary_arrow:
             self._properties["is_arrow_ipc"] = True
-        if not binary_arrow and platform.system() == "Darwin":
-            # TKP fix parquet reading on darwin
-            raise RuntimeError("Cannot read parquet files on macOS yet")
         if start_time:
             self._properties["start_time"] = start_time
         if end_time:
diff --git a/csp/tests/adapters/test_parquet.py b/csp/tests/adapters/test_parquet.py
index 73a4261e1..64e79232e 100644
--- a/csp/tests/adapters/test_parquet.py
+++ b/csp/tests/adapters/test_parquet.py
@@ -2,11 +2,9 @@
 import numpy
 import os
 import pandas
-import platform
 import polars
 import pyarrow
 import pyarrow.parquet
-import pytest
 import pytz
 import tempfile
 import unittest
@@ -34,7 +32,6 @@ class PriceQuantity2(csp.Struct):
 arrow_filename = os.path.join(os.path.dirname(__file__), "arrow_test_data.arrow")
 
 
-@pytest.mark.skipif(platform.system() == "Darwin", reason="Does not run on macOS")
 class TestParquetReader(unittest.TestCase):
     def do_test_body(self, filename, arrow=False):
         @csp.graph
diff --git a/csp/tests/test_engine.py b/csp/tests/test_engine.py
index bd604f2cb..511b43883 100644
--- a/csp/tests/test_engine.py
+++ b/csp/tests/test_engine.py
@@ -1333,7 +1333,7 @@ def test_datetime_timedelta_ranges(self):
             datetime(1969, 5, 6, 2, 3, 4),
             datetime(1969, 5, 6, 2, 3, 4, 123456),
             # Edge cases, DateTime MIN / MAX
-            datetime(1678, 1, 1),
+            datetime(1678, 1, 1) if sys.platform == 'linux' else datetime(1970,1,1),
             datetime(2261, 12, 31, 23, 59, 59, 999999),
             timedelta(days=1, seconds=3600, microseconds=123456),
             timedelta(days=-1, seconds=3600, microseconds=123456),

From 3137e13f953b59e2faaa48c1a6a136b7deced989 Mon Sep 17 00:00:00 2001
From: Rob Ambalu <robert.ambalu@point72.com>
Date: Mon, 18 Mar 2024 17:15:28 -0400
Subject: [PATCH 03/21] fixes #132 - attempt to kick off macos build

Signed-off-by: Rob Ambalu <robert.ambalu@point72.com>
---
 .github/workflows/build.yml | 4 ++--
 setup.py                    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index beb919573..ad3c889a2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -284,7 +284,7 @@ jobs:
           run: make dist-py-cibw
           env:
             CIBW_BUILD: "${{ matrix.cibuildwheel }}-macos*"
-            CIBW_ENVIRONMENT_MACOS: CC="/usr/local/bin/gcc-13" CXX="/usr/local/bin/g++-13" CCACHE_DIR="/Users/runner/work/csp/csp/.ccache" VCPKG_DEFAULT_BINARY_CACHE="${{ env.VCPKG_DEFAULT_BINARY_CACHE }}" VCPKG_DOWNLOADS="${{ env.VCPKG_DOWNLOADS }}"
+            CIBW_ENVIRONMENT_MACOS: CC="/usr/local/bin/gcc-13" CCACHE_DIR="/Users/runner/work/csp/csp/.ccache" VCPKG_DEFAULT_BINARY_CACHE="${{ env.VCPKG_DEFAULT_BINARY_CACHE }}" VCPKG_DOWNLOADS="${{ env.VCPKG_DOWNLOADS }}"
             CIBW_ARCHS_MACOS: x86_64
             CIBW_BUILD_VERBOSITY: 3
           if: ${{ matrix.os == 'macos-12' }}
@@ -293,7 +293,7 @@ jobs:
           run: make dist-py-cibw
           env:
             CIBW_BUILD: "${{ matrix.cibuildwheel }}-macos*"
-            CIBW_ENVIRONMENT_MACOS: PATH="/opt/homebrew/opt/bison/bin/:$PATH" CC="/opt/homebrew/bin/gcc-13" CXX="/opt/homebrew/bin/g++-13" LDFLAGS="-Wl,-ld_classic" CCACHE_DIR="/Users/runner/work/csp/csp/.ccache" VCPKG_DEFAULT_BINARY_CACHE="${{ env.VCPKG_DEFAULT_BINARY_CACHE }}" VCPKG_DOWNLOADS="${{ env.VCPKG_DOWNLOADS }}"
+            CIBW_ENVIRONMENT_MACOS: PATH="/opt/homebrew/opt/bison/bin/:$PATH" LDFLAGS="-Wl,-ld_classic" CCACHE_DIR="/Users/runner/work/csp/csp/.ccache" VCPKG_DEFAULT_BINARY_CACHE="${{ env.VCPKG_DEFAULT_BINARY_CACHE }}" VCPKG_DOWNLOADS="${{ env.VCPKG_DOWNLOADS }}"
             CIBW_ARCHS_MACOS: arm64
             CIBW_BUILD_VERBOSITY: 3
           if: ${{ matrix.os == 'macos-14' }}
diff --git a/setup.py b/setup.py
index 86b9d4315..9b5275511 100644
--- a/setup.py
+++ b/setup.py
@@ -60,8 +60,8 @@
     os.environ["OSX_DEPLOYMENT_TARGET"] = os.environ.get("OSX_DEPLOYMENT_TARGET", "10.13")
     os.environ["MACOSX_DEPLOYMENT_TARGET"] = os.environ.get("OSX_DEPLOYMENT_TARGET", "10.13")
 
-if hasattr(platform, "mac_ver") and platform.mac_ver()[0].startswith("14"):
-    cmake_args.append("-DCSP_USE_LD_CLASSIC_MAC=ON")
+#if hasattr(platform, "mac_ver") and platform.mac_ver()[0].startswith("14"):
+#    cmake_args.append("-DCSP_USE_LD_CLASSIC_MAC=ON")
 
 if which("ccache"):
     cmake_args.append("-DCSP_USE_CCACHE=On")

From 1217e1400eb727b4ee461fdf8b4dab0bb8255049 Mon Sep 17 00:00:00 2001
From: Nathan Goldbaum <nathan.goldbaum@gmail.com>
Date: Tue, 19 Mar 2024 09:33:41 -0600
Subject: [PATCH 04/21] unset CC in mac cibuildwheel setup

Signed-off-by: Nathan Goldbaum <nathan.goldbaum@gmail.com>
---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ad3c889a2..369d26cbe 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -284,7 +284,7 @@ jobs:
           run: make dist-py-cibw
           env:
             CIBW_BUILD: "${{ matrix.cibuildwheel }}-macos*"
-            CIBW_ENVIRONMENT_MACOS: CC="/usr/local/bin/gcc-13" CCACHE_DIR="/Users/runner/work/csp/csp/.ccache" VCPKG_DEFAULT_BINARY_CACHE="${{ env.VCPKG_DEFAULT_BINARY_CACHE }}" VCPKG_DOWNLOADS="${{ env.VCPKG_DOWNLOADS }}"
+            CIBW_ENVIRONMENT_MACOS: CCACHE_DIR="/Users/runner/work/csp/csp/.ccache" VCPKG_DEFAULT_BINARY_CACHE="${{ env.VCPKG_DEFAULT_BINARY_CACHE }}" VCPKG_DOWNLOADS="${{ env.VCPKG_DOWNLOADS }}"
             CIBW_ARCHS_MACOS: x86_64
             CIBW_BUILD_VERBOSITY: 3
           if: ${{ matrix.os == 'macos-12' }}

From 795dce706c94088567724487d0dc2f7651d6b4b7 Mon Sep 17 00:00:00 2001
From: Nathan Goldbaum <nathan.goldbaum@gmail.com>
Date: Tue, 19 Mar 2024 09:34:25 -0600
Subject: [PATCH 05/21] Add support for mac conda builds

Signed-off-by: Nathan Goldbaum <nathan.goldbaum@gmail.com>
---
 .github/workflows/conda.yml                      | 16 +++++++++++-----
 Makefile                                         |  2 +-
 ...onment-linux.yml => dev-environment-unix.yml} |  0
 3 files changed, 12 insertions(+), 6 deletions(-)
 rename conda/{dev-environment-linux.yml => dev-environment-unix.yml} (100%)

diff --git a/.github/workflows/conda.yml b/.github/workflows/conda.yml
index ed8fe2241..4d0bf431b 100644
--- a/.github/workflows/conda.yml
+++ b/.github/workflows/conda.yml
@@ -29,7 +29,13 @@ permissions:
 
 jobs:
     build:
-      runs-on: ubuntu-22.04
+      strategy:
+        matrix:
+          os:
+            - ubuntu-22.04
+            - macos-12
+            - macos-14
+      runs-on: ${{ matrix.os }}
       steps:
         - name: Checkout
           uses: actions/checkout@v4
@@ -37,7 +43,7 @@ jobs:
         - uses: mamba-org/setup-micromamba@v1
           with:
             micromamba-version: '1.5.7-0'
-            environment-file: conda/dev-environment-linux.yml
+            environment-file: conda/dev-environment-unix.yml
             init-shell: >-
               bash
             cache-environment: true
@@ -48,14 +54,14 @@ jobs:
           with:
             cibuildwheel: 'cp311'
 
-        - name: Python Lint Steps (Linux)
+        - name: Python Lint Steps
           run: make lint
           shell: micromamba-shell {0}
 
-        - name: Python Build Steps (Linux)
+        - name: Python Build Steps
           run: make build-conda
           shell: micromamba-shell {0}
 
-        - name: Python Test Steps (Linux)
+        - name: Python Test Steps
           run: make test
           shell: micromamba-shell {0}
diff --git a/Makefile b/Makefile
index 5aa2b11d3..e17730f2a 100644
--- a/Makefile
+++ b/Makefile
@@ -179,7 +179,7 @@ clean: ## clean the repository
 .PHONY: dependencies-mac dependencies-debian dependencies-fedora dependencies-vcpkg dependencies-win
 
 dependencies-mac:  ## install dependencies for mac
-	HOMEBREW_NO_AUTO_UPDATE=1 brew install bison cmake flex make ninja # gcc@13
+	HOMEBREW_NO_AUTO_UPDATE=1 brew install bison cmake flex make ninja
 	brew unlink bison flex && brew link --force bison flex
 
 dependencies-debian:  ## install dependencies for linux
diff --git a/conda/dev-environment-linux.yml b/conda/dev-environment-unix.yml
similarity index 100%
rename from conda/dev-environment-linux.yml
rename to conda/dev-environment-unix.yml

From 6bdee3742277c8231288d5f7b13ef05a04870262 Mon Sep 17 00:00:00 2001
From: Nathan Goldbaum <nathan.goldbaum@gmail.com>
Date: Tue, 19 Mar 2024 09:34:33 -0600
Subject: [PATCH 06/21] Update docs for mac builds

Signed-off-by: Nathan Goldbaum <nathan.goldbaum@gmail.com>
---
 docs/wiki/98.-Building-From-Source.md | 30 ++-------------------------
 1 file changed, 2 insertions(+), 28 deletions(-)

diff --git a/docs/wiki/98.-Building-From-Source.md b/docs/wiki/98.-Building-From-Source.md
index 1431dadf7..cc39d82be 100644
--- a/docs/wiki/98.-Building-From-Source.md
+++ b/docs/wiki/98.-Building-From-Source.md
@@ -45,7 +45,8 @@ git submodule update --init --recursive
 
 ```bash
 # Note the operating system, change as needed
-micromamba create -n csp -f conda/dev-environment-linux.yml
+# Linux and MacOS should use the unix dev environment spec
+micromamba create -n csp -f conda/dev-environment-unix.yml
 micromamba activate csp
 ```
 
@@ -111,9 +112,6 @@ sudo dnf group install "Development Tools"
 make dependencies-mac
 # or
 # brew install bison cmake flex make ninja
-
-# for g++
-brew install gcc
 ```
 
 ## Install Python dependencies
@@ -145,30 +143,6 @@ make build
 # python setup.py build build_ext --inplace
 ```
 
-### Building on `macOS`
-
-**NOTE** On `macOS`, we need to use `g++`. Complicating this, `g++` is often aliased to `clang++`, so we need to be explicit:
-
-Apple Silicon (ARM):
-
-```bash
-CXX=/opt/homebrew/bin/g++-13 make build
-
-# or
-# CXX=/opt/homebrew/bin/g++-13 python setup.py build build_ext --inplace
-```
-
-Intel:
-
-```bash
-CXX=/usr/local/bin/g++-13 make build
-
-# or
-# CXX=/usr/local/bin/g++-13 python setup.py build build_ext --inplace
-```
-
-Substitute your installed version of `g++` as necessary.
-
 ### Building on `aarch64` Linux
 
 On `aarch64` Linux the VCPKG_FORCE_SYSTEM_BINARIES environment variable must be set before running `make build`:

From c2d9f38dca7d12b98ddc25fa7767d08b7e1083d2 Mon Sep 17 00:00:00 2001
From: Nathan Goldbaum <nathan.goldbaum@gmail.com>
Date: Tue, 19 Mar 2024 10:16:16 -0600
Subject: [PATCH 07/21] attempt to fix macos-12 conda build

Signed-off-by: Nathan Goldbaum <nathan.goldbaum@gmail.com>
---
 .github/workflows/conda.yml | 1 -
 setup.py                    | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/conda.yml b/.github/workflows/conda.yml
index 4d0bf431b..b7ef00f5c 100644
--- a/.github/workflows/conda.yml
+++ b/.github/workflows/conda.yml
@@ -33,7 +33,6 @@ jobs:
         matrix:
           os:
             - ubuntu-22.04
-            - macos-12
             - macos-14
       runs-on: ${{ matrix.os }}
       steps:
diff --git a/setup.py b/setup.py
index 9b5275511..f523c5ee5 100644
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,7 @@
 
 if "CXX" in os.environ:
     cmake_args.append(f"-DCMAKE_CXX_COMPILER={os.environ['CXX']}")
-
+    
 if "DEBUG" in os.environ:
     cmake_args.append("-DCMAKE_BUILD_TYPE=Debug")
 

From 07ce7cbd5ef65521b196af0e9283dedd27fe5450 Mon Sep 17 00:00:00 2001
From: Nathan Goldbaum <nathan.goldbaum@gmail.com>
Date: Tue, 19 Mar 2024 13:57:36 -0600
Subject: [PATCH 08/21] one more try for intel mac support

Signed-off-by: Nathan Goldbaum <nathan.goldbaum@gmail.com>
---
 .github/workflows/conda.yml |  1 +
 CMakeLists.txt              | 10 ----------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/.github/workflows/conda.yml b/.github/workflows/conda.yml
index b7ef00f5c..a8af35998 100644
--- a/.github/workflows/conda.yml
+++ b/.github/workflows/conda.yml
@@ -34,6 +34,7 @@ jobs:
           os:
             - ubuntu-22.04
             - macos-14
+            - macos-12
       runs-on: ${{ matrix.os }}
       steps:
         - name: Checkout
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ace0d7051..94380a4b4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -134,16 +134,6 @@ if(MACOS)
     # Support cross build
     check_c_compiler_flag("-arch x86_64" x86_64Supported)
     check_c_compiler_flag("-arch arm64" arm64Supported)
-
-    #if(x86_64Supported AND arm64Supported)
-    #    set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64" CACHE STRING "Build universal architecture for OSX" FORCE)
-    #elseif(x86_64Supported)
-    #    set(CMAKE_REQUIRED_LINK_OPTIONS "-arch;x86_64")
-    #    set(CMAKE_OSX_ARCHITECTURES "x86_64" CACHE STRING "Build universal architecture for OSX" FORCE)
-    #elseif(arm64Supported)
-        set(CMAKE_REQUIRED_LINK_OPTIONS "-arch;arm64")
-        set(CMAKE_OSX_ARCHITECTURES "arm64" CACHE STRING "Build universal architecture for OSX" FORCE)
-    #endif()
 endif()
 
 

From 69e05fd30b8fbcd4ce0e54a9474a6ae541cebeee Mon Sep 17 00:00:00 2001
From: Nathan Goldbaum <nathan.goldbaum@gmail.com>
Date: Tue, 19 Mar 2024 14:18:45 -0600
Subject: [PATCH 09/21] reduce length of timeout for test_threaded_run

Signed-off-by: Nathan Goldbaum <nathan.goldbaum@gmail.com>
---
 csp/tests/test_engine.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/csp/tests/test_engine.py b/csp/tests/test_engine.py
index 511b43883..ed1376e0b 100644
--- a/csp/tests/test_engine.py
+++ b/csp/tests/test_engine.py
@@ -1397,7 +1397,7 @@ def g(count: int) -> csp.ts[int]:
         self.assertEqual(len(res), 5)
 
         # midway stop
-        runner = csp.run_on_thread(g, 50000, starttime=datetime.utcnow(), endtime=timedelta(minutes=30), realtime=True)
+        runner = csp.run_on_thread(g, 50000, starttime=datetime.utcnow(), endtime=timedelta(minutes=1), realtime=True)
         import time
 
         time.sleep(1)

From 7bd2aca79b11e0ff6013e5e1c1e7d25cd8edc2af Mon Sep 17 00:00:00 2001
From: Nathan Goldbaum <nathan.goldbaum@gmail.com>
Date: Tue, 19 Mar 2024 14:58:28 -0600
Subject: [PATCH 10/21] make this test more meaningful now that it has a
 shorter timeout

Signed-off-by: Nathan Goldbaum <nathan.goldbaum@gmail.com>
---
 csp/tests/test_engine.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/csp/tests/test_engine.py b/csp/tests/test_engine.py
index ed1376e0b..43706cce2 100644
--- a/csp/tests/test_engine.py
+++ b/csp/tests/test_engine.py
@@ -1403,7 +1403,7 @@ def g(count: int) -> csp.ts[int]:
         time.sleep(1)
         runner.stop_engine()
         res = runner.join()[0]
-        self.assertLess(len(res), 1000)
+        self.assertLess(len(res), 20)
 
         # exception handling
         @csp.node

From 9d0c75b112d0702f18e7db1e1519cc9671ea5d63 Mon Sep 17 00:00:00 2001
From: Rob Ambalu <robert.ambalu@point72.com>
Date: Thu, 21 Mar 2024 15:33:37 -0400
Subject: [PATCH 11/21] CMakeLists.txt - attempt tp align RPATH on linux, drop
 ../lib

Signed-off-by: Rob Ambalu <robert.ambalu@point72.com>
---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 94380a4b4..d1185c26d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -162,7 +162,7 @@ endif()
 if(MACOS)
     set(CMAKE_INSTALL_RPATH "@loader_path/")
 elseif(LINUX)
-    set(CMAKE_INSTALL_RPATH "\$ORIGIN:\$ORIGIN/../lib")
+    set(CMAKE_INSTALL_RPATH "\$ORIGIN")
 endif()
 
 ###################################################################################################################################################

From 4211e06a0597bafdd321a210da4b81a4fee78616 Mon Sep 17 00:00:00 2001
From: Rob Ambalu <robert.ambalu@point72.com>
Date: Mon, 25 Mar 2024 19:00:00 -0400
Subject: [PATCH 12/21] #132 temporarily add some debug logging to threaded
 engine to try to figure out why it fails on GH

Signed-off-by: Rob Ambalu <robert.ambalu@point72.com>
---
 csp/impl/wiring/threaded_runtime.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/csp/impl/wiring/threaded_runtime.py b/csp/impl/wiring/threaded_runtime.py
index 0726e3c44..ec3a09d62 100644
--- a/csp/impl/wiring/threaded_runtime.py
+++ b/csp/impl/wiring/threaded_runtime.py
@@ -7,20 +7,25 @@
 from csp.impl.types.tstype import ts
 from csp.impl.wiring import MAX_END_TIME, py_push_adapter_def
 
+import logging
+
 __all__ = ["run_on_thread"]
 
 
 class _EngineStopSignalImpl(PushInputAdapter):
     def __init__(self, pusher):
+        logging.info( "_EngineStopSignalImpl init with ", pusher )
         self._pusher = pusher
 
     def start(self, starttime, endtime):
+        logging.info( "_EngineStopSignalImpl registering ", self._pusher )
         self._pusher.register_impl(self)
 
     def stop(self):
         self._pusher.unregister_impl()
 
     def signal_stop(self):
+        logging.info( "_EngineStopSignalImpl signal_stop, pushing to ", self._pusher )
         self.push_tick(True)
 
 
@@ -42,6 +47,7 @@ def unregister_impl(self):
         self._pushimpl = None
 
     def stop_engine(self):
+        logging.info( "_EngineStopper.stop_engine wtih ", self._pushimpl )
         if self._pushimpl is not None:
             self._pushimpl.signal_stop()
         else:
@@ -78,12 +84,14 @@ def _wrapped_graph(graph, stopper, *args, **kwargs):
     @staticmethod
     def _run(output, graph, stopper, *args, **kwargs):
         try:
+            logging.info( "ThreadRunner::_run" )
             output["result"] = csp.run(ThreadRunner._wrapped_graph, graph, stopper, *args, **kwargs)
         except Exception as e:
             output["exc_info"] = e
 
     def stop_engine(self):
         """request engine to stop ( async )"""
+        logging.info( "ThreadRunner::stop_engine with ", self._stopper )
         if self._stopper:
             self._stopper.stop_engine()
 

From c75518145d4e4f5162438e0c8a87b4e88334f2ae Mon Sep 17 00:00:00 2001
From: Rob Ambalu <robert.ambalu@point72.com>
Date: Tue, 26 Mar 2024 09:25:48 -0400
Subject: [PATCH 13/21] #132 fix lint for test logging

Signed-off-by: Rob Ambalu <robert.ambalu@point72.com>
---
 csp/impl/wiring/threaded_runtime.py | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/csp/impl/wiring/threaded_runtime.py b/csp/impl/wiring/threaded_runtime.py
index ec3a09d62..a403911e7 100644
--- a/csp/impl/wiring/threaded_runtime.py
+++ b/csp/impl/wiring/threaded_runtime.py
@@ -1,3 +1,4 @@
+import logging
 import threading
 from typing import Optional
 
@@ -7,25 +8,23 @@
 from csp.impl.types.tstype import ts
 from csp.impl.wiring import MAX_END_TIME, py_push_adapter_def
 
-import logging
-
 __all__ = ["run_on_thread"]
 
 
 class _EngineStopSignalImpl(PushInputAdapter):
     def __init__(self, pusher):
-        logging.info( "_EngineStopSignalImpl init with ", pusher )
+        logging.info("_EngineStopSignalImpl init with ", pusher)
         self._pusher = pusher
 
     def start(self, starttime, endtime):
-        logging.info( "_EngineStopSignalImpl registering ", self._pusher )
+        logging.info("_EngineStopSignalImpl registering ", self._pusher)
         self._pusher.register_impl(self)
 
     def stop(self):
         self._pusher.unregister_impl()
 
     def signal_stop(self):
-        logging.info( "_EngineStopSignalImpl signal_stop, pushing to ", self._pusher )
+        logging.info("_EngineStopSignalImpl signal_stop, pushing to ", self._pusher)
         self.push_tick(True)
 
 
@@ -47,7 +46,7 @@ def unregister_impl(self):
         self._pushimpl = None
 
     def stop_engine(self):
-        logging.info( "_EngineStopper.stop_engine wtih ", self._pushimpl )
+        logging.info("_EngineStopper.stop_engine wtih ", self._pushimpl)
         if self._pushimpl is not None:
             self._pushimpl.signal_stop()
         else:
@@ -84,14 +83,14 @@ def _wrapped_graph(graph, stopper, *args, **kwargs):
     @staticmethod
     def _run(output, graph, stopper, *args, **kwargs):
         try:
-            logging.info( "ThreadRunner::_run" )
+            logging.info("ThreadRunner::_run")
             output["result"] = csp.run(ThreadRunner._wrapped_graph, graph, stopper, *args, **kwargs)
         except Exception as e:
             output["exc_info"] = e
 
     def stop_engine(self):
         """request engine to stop ( async )"""
-        logging.info( "ThreadRunner::stop_engine with ", self._stopper )
+        logging.info("ThreadRunner::stop_engine with ", self._stopper)
         if self._stopper:
             self._stopper.stop_engine()
 

From e0aa7edcca47b717e6d0c234c26f95b779db2f7a Mon Sep 17 00:00:00 2001
From: Rob Ambalu <robert.ambalu@point72.com>
Date: Tue, 26 Mar 2024 09:38:42 -0400
Subject: [PATCH 14/21] #132 enable stdout logging for tests, revert
 test_engine back to old timing

Signed-off-by: Rob Ambalu <robert.ambalu@point72.com>
---
 Makefile                 | 2 +-
 csp/tests/test_engine.py | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 08e56a3b2..ab99f047a 100644
--- a/Makefile
+++ b/Makefile
@@ -83,7 +83,7 @@ checks: check
 
 TEST_ARGS :=
 test-py: ## Clean and Make unit tests
-	python -m pytest -v csp/tests --junitxml=junit.xml $(TEST_ARGS)
+	python -m pytest -sv csp/tests --junitxml=junit.xml $(TEST_ARGS)
 
 test-cpp: ## Make C++ unit tests
 	for f in ./csp/tests/bin/*; do $$f; done || (echo "TEST FAILED" && exit 1)
diff --git a/csp/tests/test_engine.py b/csp/tests/test_engine.py
index e474807a3..3ae54afbb 100644
--- a/csp/tests/test_engine.py
+++ b/csp/tests/test_engine.py
@@ -1334,7 +1334,7 @@ def test_datetime_timedelta_ranges(self):
             datetime(1969, 5, 6, 2, 3, 4),
             datetime(1969, 5, 6, 2, 3, 4, 123456),
             # Edge cases, DateTime MIN / MAX
-            datetime(1678, 1, 1) if sys.platform == 'linux' else datetime(1970,1,1),
+            datetime(1678, 1, 1) if sys.platform == "linux" else datetime(1970, 1, 1),
             datetime(2261, 12, 31, 23, 59, 59, 999999),
             timedelta(days=1, seconds=3600, microseconds=123456),
             timedelta(days=-1, seconds=3600, microseconds=123456),
@@ -1398,13 +1398,13 @@ def g(count: int) -> csp.ts[int]:
         self.assertEqual(len(res), 5)
 
         # midway stop
-        runner = csp.run_on_thread(g, 50000, starttime=datetime.utcnow(), endtime=timedelta(minutes=1), realtime=True)
+        runner = csp.run_on_thread(g, 50000, starttime=datetime.utcnow(), endtime=timedelta(minutes=30), realtime=True)
         import time
 
         time.sleep(1)
         runner.stop_engine()
         res = runner.join()[0]
-        self.assertLess(len(res), 20)
+        self.assertLess(len(res), 1000)
 
         # exception handling
         @csp.node

From 92320eae89c4323b74e785abe25672b1b93ad354 Mon Sep 17 00:00:00 2001
From: Rob Ambalu <robert.ambalu@point72.com>
Date: Tue, 26 Mar 2024 11:09:45 -0400
Subject: [PATCH 15/21] #132 - next atempt

Signed-off-by: Rob Ambalu <robert.ambalu@point72.com>
---
 .github/workflows/build.yml         |  2 +-
 csp/impl/wiring/threaded_runtime.py | 14 +++++++-------
 csp/tests/test_engine.py            |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 944b4386a..af9f40611 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -293,7 +293,7 @@ jobs:
           run: make dist-py-cibw
           env:
             CIBW_BUILD: "${{ matrix.cibuildwheel }}-macos*"
-            CIBW_ENVIRONMENT_MACOS: PATH="/opt/homebrew/opt/bison/bin/:$PATH" LDFLAGS="-Wl,-ld_classic" CCACHE_DIR="/Users/runner/work/csp/csp/.ccache" VCPKG_DEFAULT_BINARY_CACHE="${{ env.VCPKG_DEFAULT_BINARY_CACHE }}" VCPKG_DOWNLOADS="${{ env.VCPKG_DOWNLOADS }}"
+            CIBW_ENVIRONMENT_MACOS: CCACHE_DIR="/Users/runner/work/csp/csp/.ccache" VCPKG_DEFAULT_BINARY_CACHE="${{ env.VCPKG_DEFAULT_BINARY_CACHE }}" VCPKG_DOWNLOADS="${{ env.VCPKG_DOWNLOADS }}"
             CIBW_ARCHS_MACOS: arm64
             CIBW_BUILD_VERBOSITY: 3
           if: ${{ matrix.os == 'macos-14' }}
diff --git a/csp/impl/wiring/threaded_runtime.py b/csp/impl/wiring/threaded_runtime.py
index a403911e7..1d85a041c 100644
--- a/csp/impl/wiring/threaded_runtime.py
+++ b/csp/impl/wiring/threaded_runtime.py
@@ -1,4 +1,3 @@
-import logging
 import threading
 from typing import Optional
 
@@ -13,18 +12,18 @@
 
 class _EngineStopSignalImpl(PushInputAdapter):
     def __init__(self, pusher):
-        logging.info("_EngineStopSignalImpl init with ", pusher)
+        print("_EngineStopSignalImpl init with ", pusher)
         self._pusher = pusher
 
     def start(self, starttime, endtime):
-        logging.info("_EngineStopSignalImpl registering ", self._pusher)
+        print("_EngineStopSignalImpl registering ", self._pusher)
         self._pusher.register_impl(self)
 
     def stop(self):
         self._pusher.unregister_impl()
 
     def signal_stop(self):
-        logging.info("_EngineStopSignalImpl signal_stop, pushing to ", self._pusher)
+        print("_EngineStopSignalImpl signal_stop, pushing to ", self._pusher)
         self.push_tick(True)
 
 
@@ -46,7 +45,7 @@ def unregister_impl(self):
         self._pushimpl = None
 
     def stop_engine(self):
-        logging.info("_EngineStopper.stop_engine wtih ", self._pushimpl)
+        print("_EngineStopper.stop_engine wtih ", self._pushimpl)
         if self._pushimpl is not None:
             self._pushimpl.signal_stop()
         else:
@@ -77,20 +76,21 @@ def __init__(self, g, *args, **kwargs):
     @staticmethod
     def _wrapped_graph(graph, stopper, *args, **kwargs):
         stop_signal = _EngineStopSignal(stopper)
+        csp.print( "stop_signal", stop_signal )
         csp.stop_engine(stop_signal)
         return graph(*args, **kwargs)
 
     @staticmethod
     def _run(output, graph, stopper, *args, **kwargs):
         try:
-            logging.info("ThreadRunner::_run")
+            print("ThreadRunner::_run")
             output["result"] = csp.run(ThreadRunner._wrapped_graph, graph, stopper, *args, **kwargs)
         except Exception as e:
             output["exc_info"] = e
 
     def stop_engine(self):
         """request engine to stop ( async )"""
-        logging.info("ThreadRunner::stop_engine with ", self._stopper)
+        print("ThreadRunner::stop_engine with ", self._stopper)
         if self._stopper:
             self._stopper.stop_engine()
 
diff --git a/csp/tests/test_engine.py b/csp/tests/test_engine.py
index 3ae54afbb..5d5030c87 100644
--- a/csp/tests/test_engine.py
+++ b/csp/tests/test_engine.py
@@ -1398,13 +1398,13 @@ def g(count: int) -> csp.ts[int]:
         self.assertEqual(len(res), 5)
 
         # midway stop
-        runner = csp.run_on_thread(g, 50000, starttime=datetime.utcnow(), endtime=timedelta(minutes=30), realtime=True)
+        runner = csp.run_on_thread(g, 50000, starttime=datetime.utcnow(), endtime=timedelta(minutes=1), realtime=True)
         import time
 
         time.sleep(1)
         runner.stop_engine()
         res = runner.join()[0]
-        self.assertLess(len(res), 1000)
+        self.assertLess(len(res), 20)
 
         # exception handling
         @csp.node

From f33e8cc6ae93b0183269f79f1487dd2d2a86f544 Mon Sep 17 00:00:00 2001
From: Rob Ambalu <robert.ambalu@point72.com>
Date: Tue, 26 Mar 2024 11:29:40 -0400
Subject: [PATCH 16/21] #132 - next attempt

Signed-off-by: Rob Ambalu <robert.ambalu@point72.com>
---
 .github/workflows/build.yml | 6 +++++-
 csp/tests/test_engine.py    | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index af9f40611..24ecbfb4b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -251,7 +251,7 @@ jobs:
           with:
             submodules: recursive
             fetch-depth: 0
-
+      
         - name: Set up Python ${{ matrix.python-version }}
           uses: ./.github/actions/setup-python
           with:
@@ -298,6 +298,10 @@ jobs:
             CIBW_BUILD_VERBOSITY: 3
           if: ${{ matrix.os == 'macos-14' }}
 
+        - name: Setup tmate session macos-14
+          uses: mxschmitt/action-tmate@v3
+          if: ${{ matrix.os == 'macos-14' }}
+          
         ##########
         # Windows
         - name: Python Build Steps (Windows vc14.3)
diff --git a/csp/tests/test_engine.py b/csp/tests/test_engine.py
index 5d5030c87..38e4e4acf 100644
--- a/csp/tests/test_engine.py
+++ b/csp/tests/test_engine.py
@@ -1398,7 +1398,7 @@ def g(count: int) -> csp.ts[int]:
         self.assertEqual(len(res), 5)
 
         # midway stop
-        runner = csp.run_on_thread(g, 50000, starttime=datetime.utcnow(), endtime=timedelta(minutes=1), realtime=True)
+        runner = csp.run_on_thread(g, 50000, starttime=datetime.utcnow(), endtime=timedelta(minutes=10), realtime=True)
         import time
 
         time.sleep(1)

From d87deda315d17db1feca344304aef6b3a7ce9938 Mon Sep 17 00:00:00 2001
From: Rob Ambalu <robert.ambalu@point72.com>
Date: Tue, 26 Mar 2024 12:02:59 -0400
Subject: [PATCH 17/21] #132 - next attempt

Signed-off-by: Rob Ambalu <robert.ambalu@point72.com>
---
 .github/workflows/conda.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/conda.yml b/.github/workflows/conda.yml
index 4aecf2bfe..4e849a4a9 100644
--- a/.github/workflows/conda.yml
+++ b/.github/workflows/conda.yml
@@ -62,6 +62,11 @@ jobs:
           run: make build-conda
           shell: micromamba-shell {0}
 
+        - name: Setup remote debugging session
+          uses: mxschmitt/action-tmate@v3
+
         - name: Python Test Steps
           run: make test
           shell: micromamba-shell {0}
+
+       
\ No newline at end of file

From 10145370f48179d3c15bd6c9ee957d3fca22e3ad Mon Sep 17 00:00:00 2001
From: Rob Ambalu <robert.ambalu@point72.com>
Date: Tue, 26 Mar 2024 22:58:48 -0400
Subject: [PATCH 18/21] fixes #132 - Fix race condition exposed in macos build
 where push events can be deferred indefinitely if timer executes before event
 ( wait will keep waiting until max time, even if an event is pending )
 Simplify QueueWaiter ( remove it entirely ) and move condvar/mutex/blocking
 logic directly into SRMWLockFreeQueue so that we can check on m_head
 directly. Revert all intermediate changes that were committed for testing /
 tracking down this issue

Signed-off-by: Rob Ambalu <robert.ambalu@point72.com>
---
 .github/workflows/build.yml         |  4 --
 .github/workflows/conda.yml         |  3 --
 Makefile                            |  2 +-
 cpp/csp/core/CMakeLists.txt         |  1 -
 cpp/csp/core/QueueWaiter.h          | 49 -------------------------
 cpp/csp/core/SRMWLockFreeQueue.h    | 57 +++++++++++++++++------------
 csp/impl/wiring/threaded_runtime.py |  7 ----
 csp/tests/test_engine.py            |  4 +-
 8 files changed, 36 insertions(+), 91 deletions(-)
 delete mode 100644 cpp/csp/core/QueueWaiter.h

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 24ecbfb4b..e7b7775cc 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -298,10 +298,6 @@ jobs:
             CIBW_BUILD_VERBOSITY: 3
           if: ${{ matrix.os == 'macos-14' }}
 
-        - name: Setup tmate session macos-14
-          uses: mxschmitt/action-tmate@v3
-          if: ${{ matrix.os == 'macos-14' }}
-          
         ##########
         # Windows
         - name: Python Build Steps (Windows vc14.3)
diff --git a/.github/workflows/conda.yml b/.github/workflows/conda.yml
index 4e849a4a9..8152c1ed3 100644
--- a/.github/workflows/conda.yml
+++ b/.github/workflows/conda.yml
@@ -62,9 +62,6 @@ jobs:
           run: make build-conda
           shell: micromamba-shell {0}
 
-        - name: Setup remote debugging session
-          uses: mxschmitt/action-tmate@v3
-
         - name: Python Test Steps
           run: make test
           shell: micromamba-shell {0}
diff --git a/Makefile b/Makefile
index ab99f047a..08e56a3b2 100644
--- a/Makefile
+++ b/Makefile
@@ -83,7 +83,7 @@ checks: check
 
 TEST_ARGS :=
 test-py: ## Clean and Make unit tests
-	python -m pytest -sv csp/tests --junitxml=junit.xml $(TEST_ARGS)
+	python -m pytest -v csp/tests --junitxml=junit.xml $(TEST_ARGS)
 
 test-cpp: ## Make C++ unit tests
 	for f in ./csp/tests/bin/*; do $$f; done || (echo "TEST FAILED" && exit 1)
diff --git a/cpp/csp/core/CMakeLists.txt b/cpp/csp/core/CMakeLists.txt
index 672323794..c27aa419a 100644
--- a/cpp/csp/core/CMakeLists.txt
+++ b/cpp/csp/core/CMakeLists.txt
@@ -9,7 +9,6 @@ set(CORE_PUBLIC_HEADERS
       Generator.h
       Hash.h
       Likely.h
-      QueueWaiter.h
       Platform.h
       SRMWLockFreeQueue.h
       System.h
diff --git a/cpp/csp/core/QueueWaiter.h b/cpp/csp/core/QueueWaiter.h
deleted file mode 100644
index b95625a02..000000000
--- a/cpp/csp/core/QueueWaiter.h
+++ /dev/null
@@ -1,49 +0,0 @@
-#ifndef _IN_CSP_CORE_QUEUEBLOCKINGWAIT_H
-#define _IN_CSP_CORE_QUEUEBLOCKINGWAIT_H
-
-#include <mutex>
-#include <condition_variable>
-#include <csp/core/Time.h>
-#include <csp/core/System.h>
-
-namespace csp
-{
-
-class TimeDelta;
-
-class QueueWaiter
-{
-public:
-    QueueWaiter() : m_eventsPending( false )
-    {}
-
-    void notify()
-    {
-        std::lock_guard<std::mutex> guard( m_lock );
-        if( !m_eventsPending )
-            m_condition.notify_one();
-        m_eventsPending = true;
-
-    }
-
-    bool wait( TimeDelta maxWaitTime )
-    {
-        std::unique_lock<std::mutex> lock( m_lock );
-        bool rv = false;
-        if( !m_eventsPending && maxWaitTime.asNanoseconds() > 0 )
-        {
-            rv = ( m_condition.wait_for( lock, std::chrono::nanoseconds( maxWaitTime.asNanoseconds() ) ) == std::cv_status::no_timeout );
-        }
-        m_eventsPending = false;
-        return rv;
-    }
-
-private:
-    std::mutex              m_lock;
-    std::condition_variable m_condition;
-    bool                    m_eventsPending;
-};
-
-}
-
-#endif
diff --git a/cpp/csp/core/SRMWLockFreeQueue.h b/cpp/csp/core/SRMWLockFreeQueue.h
index 902c8a364..8d20aa32b 100644
--- a/cpp/csp/core/SRMWLockFreeQueue.h
+++ b/cpp/csp/core/SRMWLockFreeQueue.h
@@ -1,10 +1,11 @@
 #ifndef _IN_CSP_CORE_SRMWLOCKFREEQUEUE_H
 #define _IN_CSP_CORE_SRMWLOCKFREEQUEUE_H
 
-#include <csp/core/QueueWaiter.h>
 #include <csp/core/System.h>
 #include <csp/core/Time.h>
 #include <atomic>
+#include <condition_variable>
+#include <mutex>
 
 namespace csp
 {
@@ -51,17 +52,16 @@ class alignas(CACHELINE_SIZE) SRMWLockFreeQueue
         friend class SRMWLockFreeQueue;
     };
 
-    SRMWLockFreeQueue( bool blocking = false ) : m_head( nullptr ),
-            m_wait( blocking ? new QueueWaiter : nullptr ), m_curItems( nullptr ) {}
-    ~SRMWLockFreeQueue() { delete( m_wait ); }
+    SRMWLockFreeQueue( bool blocking = false ) : m_blocking( blocking ), m_head( nullptr )
+    {}
+    
+    ~SRMWLockFreeQueue() {}
 
     bool empty() const { return m_head == nullptr && m_curItems == nullptr; }
     void push( T * );
     //atomic push, batch will be cleared after this call
     void push( Batch & batch ); 
 
-    bool wait( TimeDelta maxWait );
-
     //pop calls can return NULL if empty
     //pop a single item
     T * pop( TimeDelta maxWait = TimeDelta() );
@@ -71,9 +71,24 @@ class alignas(CACHELINE_SIZE) SRMWLockFreeQueue
     //pop all pending items, need to iterate over T -> next
     T * popAll( TimeDelta maxWait = TimeDelta() );
 
+    void wait( TimeDelta maxWait )
+    {
+        if( !m_blocking || maxWait.asNanoseconds() <= 0 )
+            return;
+
+        std::unique_lock<std::mutex> lock( m_lock );
+        if( !m_head.load( std::memory_order_relaxed ) )
+            m_condition.wait_for( lock, std::chrono::nanoseconds( maxWait.asNanoseconds() ), [this]() { return m_head.load() != nullptr ; } );
+    }
+
 private:
+
+    //These arent used if we are busy looping
+    bool                        m_blocking;
+    std::mutex                  m_lock;
+    std::condition_variable     m_condition;
+    
     std::atomic<T *>            m_head;
-    QueueWaiter *               m_wait;
     alignas(CACHELINE_SIZE) T * m_curItems;
 };
 
@@ -82,12 +97,13 @@ inline void SRMWLockFreeQueue<T>::push( T * item )
 {
     //ABA problem?  Not sure, even if head pointer did go through an ABA cycle
     //it seems like the queue will still stay stable
-    item -> next = m_head.load( std::memory_order_relaxed );
+    T * old_head = m_head.load( std::memory_order_relaxed );
+    item -> next = old_head;
     while( !m_head.compare_exchange_weak( item -> next, item, std::memory_order_release ) ) 
     {}
 
-    if( unlikely( m_wait != nullptr ) )
-        m_wait -> notify();
+    if( m_blocking && old_head == nullptr )
+        m_condition.notify_one();
 }
 
 template< typename T >
@@ -95,14 +111,15 @@ inline void SRMWLockFreeQueue<T>::push( Batch & batch )
 {
     //Batch already gaurantees events are in the correct reverse ordering
     //so we just set m_head to batch head and link batch tail to previous head
-    batch.m_tail -> next = m_head.load( std::memory_order_relaxed );
+    T * old_head = m_head.load( std::memory_order_relaxed );
+    batch.m_tail -> next = old_head;
     while( !m_head.compare_exchange_weak( batch.m_tail -> next, batch.m_head, std::memory_order_release ) ) 
     {}
 
     batch.clear();
 
-    if( unlikely( m_wait != nullptr ) )
-        m_wait -> notify();
+    if( m_blocking && old_head == nullptr )
+        m_condition.notify_one();
 }
 
 template< typename T >
@@ -134,23 +151,15 @@ inline T * SRMWLockFreeQueue<T>::peek()
     return m_curItems;
 }
 
-template< typename T >
-inline bool SRMWLockFreeQueue<T>::wait( TimeDelta maxWait )
-{
-    if( m_wait == nullptr || maxWait.asNanoseconds() <= 0 )
-        return false;
-
-    return m_wait -> wait( maxWait );
-}
-
 template< typename T >
 inline T * SRMWLockFreeQueue<T>::popAll( TimeDelta maxWait )
 {
-    if( unlikely( m_wait != nullptr && maxWait.asNanoseconds() > 0 && m_head == nullptr ) )
-        m_wait -> wait( maxWait );
+    if( m_blocking )
+        wait( maxWait );
 
     T * head = m_head.exchange( nullptr );
     T * prev = nullptr;
+
     while( head )
     {
         T * next = head -> next;
diff --git a/csp/impl/wiring/threaded_runtime.py b/csp/impl/wiring/threaded_runtime.py
index 1d85a041c..0726e3c44 100644
--- a/csp/impl/wiring/threaded_runtime.py
+++ b/csp/impl/wiring/threaded_runtime.py
@@ -12,18 +12,15 @@
 
 class _EngineStopSignalImpl(PushInputAdapter):
     def __init__(self, pusher):
-        print("_EngineStopSignalImpl init with ", pusher)
         self._pusher = pusher
 
     def start(self, starttime, endtime):
-        print("_EngineStopSignalImpl registering ", self._pusher)
         self._pusher.register_impl(self)
 
     def stop(self):
         self._pusher.unregister_impl()
 
     def signal_stop(self):
-        print("_EngineStopSignalImpl signal_stop, pushing to ", self._pusher)
         self.push_tick(True)
 
 
@@ -45,7 +42,6 @@ def unregister_impl(self):
         self._pushimpl = None
 
     def stop_engine(self):
-        print("_EngineStopper.stop_engine wtih ", self._pushimpl)
         if self._pushimpl is not None:
             self._pushimpl.signal_stop()
         else:
@@ -76,21 +72,18 @@ def __init__(self, g, *args, **kwargs):
     @staticmethod
     def _wrapped_graph(graph, stopper, *args, **kwargs):
         stop_signal = _EngineStopSignal(stopper)
-        csp.print( "stop_signal", stop_signal )
         csp.stop_engine(stop_signal)
         return graph(*args, **kwargs)
 
     @staticmethod
     def _run(output, graph, stopper, *args, **kwargs):
         try:
-            print("ThreadRunner::_run")
             output["result"] = csp.run(ThreadRunner._wrapped_graph, graph, stopper, *args, **kwargs)
         except Exception as e:
             output["exc_info"] = e
 
     def stop_engine(self):
         """request engine to stop ( async )"""
-        print("ThreadRunner::stop_engine with ", self._stopper)
         if self._stopper:
             self._stopper.stop_engine()
 
diff --git a/csp/tests/test_engine.py b/csp/tests/test_engine.py
index 38e4e4acf..3ae54afbb 100644
--- a/csp/tests/test_engine.py
+++ b/csp/tests/test_engine.py
@@ -1398,13 +1398,13 @@ def g(count: int) -> csp.ts[int]:
         self.assertEqual(len(res), 5)
 
         # midway stop
-        runner = csp.run_on_thread(g, 50000, starttime=datetime.utcnow(), endtime=timedelta(minutes=10), realtime=True)
+        runner = csp.run_on_thread(g, 50000, starttime=datetime.utcnow(), endtime=timedelta(minutes=30), realtime=True)
         import time
 
         time.sleep(1)
         runner.stop_engine()
         res = runner.join()[0]
-        self.assertLess(len(res), 20)
+        self.assertLess(len(res), 1000)
 
         # exception handling
         @csp.node

From 6f8b9fabff01d66d8d992a9c9a273966c46246e2 Mon Sep 17 00:00:00 2001
From: Rob Ambalu <robert.ambalu@point72.com>
Date: Wed, 27 Mar 2024 08:55:50 -0400
Subject: [PATCH 19/21] fixes #132 - undo intrusive LFQueue changes ( for now
 ), simplify the fix and attack the queue issue properly another day.  fix cpp
 time test

Signed-off-by: Rob Ambalu <robert.ambalu@point72.com>
---
 cpp/csp/core/CMakeLists.txt      |  1 +
 cpp/csp/core/QueueWaiter.h       | 49 +++++++++++++++++++++++++++
 cpp/csp/core/SRMWLockFreeQueue.h | 57 ++++++++++++++------------------
 cpp/csp/engine/RootEngine.cpp    |  8 ++++-
 cpp/tests/core/test_time.cpp     |  2 ++
 5 files changed, 83 insertions(+), 34 deletions(-)
 create mode 100644 cpp/csp/core/QueueWaiter.h

diff --git a/cpp/csp/core/CMakeLists.txt b/cpp/csp/core/CMakeLists.txt
index c27aa419a..672323794 100644
--- a/cpp/csp/core/CMakeLists.txt
+++ b/cpp/csp/core/CMakeLists.txt
@@ -9,6 +9,7 @@ set(CORE_PUBLIC_HEADERS
       Generator.h
       Hash.h
       Likely.h
+      QueueWaiter.h
       Platform.h
       SRMWLockFreeQueue.h
       System.h
diff --git a/cpp/csp/core/QueueWaiter.h b/cpp/csp/core/QueueWaiter.h
new file mode 100644
index 000000000..307930cd5
--- /dev/null
+++ b/cpp/csp/core/QueueWaiter.h
@@ -0,0 +1,49 @@
+#ifndef _IN_CSP_CORE_QUEUEBLOCKINGWAIT_H
+#define _IN_CSP_CORE_QUEUEBLOCKINGWAIT_H
+
+#include <mutex>
+#include <condition_variable>
+#include <csp/core/Time.h>
+#include <csp/core/System.h>
+
+namespace csp
+{
+
+class TimeDelta;
+
+class QueueWaiter
+{
+public:
+    QueueWaiter() : m_eventsPending( false )
+    {}
+
+    void notify()
+    {
+        std::lock_guard<std::mutex> guard( m_lock );
+        if( !m_eventsPending )
+            m_condition.notify_one();
+        m_eventsPending = true;
+
+    }
+
+    bool wait( TimeDelta maxWaitTime )
+    {
+        std::unique_lock<std::mutex> lock( m_lock );
+        bool rv = false;
+        if( !m_eventsPending && maxWaitTime.asNanoseconds() > 0 )
+            rv = m_condition.wait_for( lock, std::chrono::nanoseconds( maxWaitTime.asNanoseconds() ), [this]() { return m_eventsPending; } );
+
+        if( rv )
+            m_eventsPending = false;
+        return rv;
+    }
+
+private:
+    std::mutex              m_lock;
+    std::condition_variable m_condition;
+    bool                    m_eventsPending;
+};
+
+}
+
+#endif
diff --git a/cpp/csp/core/SRMWLockFreeQueue.h b/cpp/csp/core/SRMWLockFreeQueue.h
index 8d20aa32b..902c8a364 100644
--- a/cpp/csp/core/SRMWLockFreeQueue.h
+++ b/cpp/csp/core/SRMWLockFreeQueue.h
@@ -1,11 +1,10 @@
 #ifndef _IN_CSP_CORE_SRMWLOCKFREEQUEUE_H
 #define _IN_CSP_CORE_SRMWLOCKFREEQUEUE_H
 
+#include <csp/core/QueueWaiter.h>
 #include <csp/core/System.h>
 #include <csp/core/Time.h>
 #include <atomic>
-#include <condition_variable>
-#include <mutex>
 
 namespace csp
 {
@@ -52,16 +51,17 @@ class alignas(CACHELINE_SIZE) SRMWLockFreeQueue
         friend class SRMWLockFreeQueue;
     };
 
-    SRMWLockFreeQueue( bool blocking = false ) : m_blocking( blocking ), m_head( nullptr )
-    {}
-    
-    ~SRMWLockFreeQueue() {}
+    SRMWLockFreeQueue( bool blocking = false ) : m_head( nullptr ),
+            m_wait( blocking ? new QueueWaiter : nullptr ), m_curItems( nullptr ) {}
+    ~SRMWLockFreeQueue() { delete( m_wait ); }
 
     bool empty() const { return m_head == nullptr && m_curItems == nullptr; }
     void push( T * );
     //atomic push, batch will be cleared after this call
     void push( Batch & batch ); 
 
+    bool wait( TimeDelta maxWait );
+
     //pop calls can return NULL if empty
     //pop a single item
     T * pop( TimeDelta maxWait = TimeDelta() );
@@ -71,24 +71,9 @@ class alignas(CACHELINE_SIZE) SRMWLockFreeQueue
     //pop all pending items, need to iterate over T -> next
     T * popAll( TimeDelta maxWait = TimeDelta() );
 
-    void wait( TimeDelta maxWait )
-    {
-        if( !m_blocking || maxWait.asNanoseconds() <= 0 )
-            return;
-
-        std::unique_lock<std::mutex> lock( m_lock );
-        if( !m_head.load( std::memory_order_relaxed ) )
-            m_condition.wait_for( lock, std::chrono::nanoseconds( maxWait.asNanoseconds() ), [this]() { return m_head.load() != nullptr ; } );
-    }
-
 private:
-
-    //These arent used if we are busy looping
-    bool                        m_blocking;
-    std::mutex                  m_lock;
-    std::condition_variable     m_condition;
-    
     std::atomic<T *>            m_head;
+    QueueWaiter *               m_wait;
     alignas(CACHELINE_SIZE) T * m_curItems;
 };
 
@@ -97,13 +82,12 @@ inline void SRMWLockFreeQueue<T>::push( T * item )
 {
     //ABA problem?  Not sure, even if head pointer did go through an ABA cycle
     //it seems like the queue will still stay stable
-    T * old_head = m_head.load( std::memory_order_relaxed );
-    item -> next = old_head;
+    item -> next = m_head.load( std::memory_order_relaxed );
     while( !m_head.compare_exchange_weak( item -> next, item, std::memory_order_release ) ) 
     {}
 
-    if( m_blocking && old_head == nullptr )
-        m_condition.notify_one();
+    if( unlikely( m_wait != nullptr ) )
+        m_wait -> notify();
 }
 
 template< typename T >
@@ -111,15 +95,14 @@ inline void SRMWLockFreeQueue<T>::push( Batch & batch )
 {
     //Batch already gaurantees events are in the correct reverse ordering
     //so we just set m_head to batch head and link batch tail to previous head
-    T * old_head = m_head.load( std::memory_order_relaxed );
-    batch.m_tail -> next = old_head;
+    batch.m_tail -> next = m_head.load( std::memory_order_relaxed );
     while( !m_head.compare_exchange_weak( batch.m_tail -> next, batch.m_head, std::memory_order_release ) ) 
     {}
 
     batch.clear();
 
-    if( m_blocking && old_head == nullptr )
-        m_condition.notify_one();
+    if( unlikely( m_wait != nullptr ) )
+        m_wait -> notify();
 }
 
 template< typename T >
@@ -151,15 +134,23 @@ inline T * SRMWLockFreeQueue<T>::peek()
     return m_curItems;
 }
 
+template< typename T >
+inline bool SRMWLockFreeQueue<T>::wait( TimeDelta maxWait )
+{
+    if( m_wait == nullptr || maxWait.asNanoseconds() <= 0 )
+        return false;
+
+    return m_wait -> wait( maxWait );
+}
+
 template< typename T >
 inline T * SRMWLockFreeQueue<T>::popAll( TimeDelta maxWait )
 {
-    if( m_blocking )
-        wait( maxWait );
+    if( unlikely( m_wait != nullptr && maxWait.asNanoseconds() > 0 && m_head == nullptr ) )
+        m_wait -> wait( maxWait );
 
     T * head = m_head.exchange( nullptr );
     T * prev = nullptr;
-
     while( head )
     {
         T * next = head -> next;
diff --git a/cpp/csp/engine/RootEngine.cpp b/cpp/csp/engine/RootEngine.cpp
index f6a51c651..0be14dbaa 100644
--- a/cpp/csp/engine/RootEngine.cpp
+++ b/cpp/csp/engine/RootEngine.cpp
@@ -160,6 +160,7 @@ void RootEngine::runRealtime( DateTime end )
     std::vector<PushGroup *> dirtyGroups;
 
     m_inRealtime = true;
+    bool haveEvents = false;
     while( m_state == State::RUNNING && !g_SIGNALED )
     {
         TimeDelta waitTime;
@@ -171,9 +172,13 @@ void RootEngine::runRealtime( DateTime end )
                 waitTime = std::min( m_scheduler.nextTime() - DateTime::now(), waitTime );
         }
 
+        if( !haveEvents )
         {
+            //We keep the ahveEvents flag in case there were events, but we only decided to execute
+            //timers in the previous cycle, then we shouldnt wait again ( which can actually lead to cases
+            //where we miss triggers )
             DialectReleaseGIL release( this );
-            m_pushEventQueue.wait( waitTime );
+            haveEvents = m_pushEventQueue.wait( waitTime );
         }
 
         //grab time after waitForEvents so that we dont grab events with time > now
@@ -201,6 +206,7 @@ void RootEngine::runRealtime( DateTime end )
                 group -> state = PushGroup::NONE;
             
             dirtyGroups.clear();
+            haveEvents = false;
         }
 
         m_cycleStepTable.executeCycle( m_profiler.get() );
diff --git a/cpp/tests/core/test_time.cpp b/cpp/tests/core/test_time.cpp
index 60c56dac3..3264c5d3d 100644
--- a/cpp/tests/core/test_time.cpp
+++ b/cpp/tests/core/test_time.cpp
@@ -159,6 +159,7 @@ TEST( DateTimeEx, test_basic_functionality )
     ASSERT_EQ( ex2.microseconds(), 123456 );
     ASSERT_EQ( ex2.nanoseconds(),  123456789 );
 
+#ifdef __linux__
     dt = DateTime( 1888, 11, 15, 23, 15, 59, 999999999 );
     DateTimeEx ex3( dt );
 
@@ -172,6 +173,7 @@ TEST( DateTimeEx, test_basic_functionality )
     ASSERT_EQ( ex3.milliseconds(), 999 );
     ASSERT_EQ( ex3.microseconds(), 999999 );
     ASSERT_EQ( ex3.nanoseconds(),  999999999 );
+#endif
 }
 
 TEST( TimeTest, test_basic_functionality )

From 232f71f72cd423ce36b9c2215fd3d569697b55c6 Mon Sep 17 00:00:00 2001
From: Rob Ambalu <robert.ambalu@point72.com>
Date: Wed, 27 Mar 2024 09:08:53 -0400
Subject: [PATCH 20/21] fixes #132 - fix comment typo

Signed-off-by: Rob Ambalu <robert.ambalu@point72.com>
---
 cpp/csp/engine/RootEngine.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cpp/csp/engine/RootEngine.cpp b/cpp/csp/engine/RootEngine.cpp
index 0be14dbaa..a65f3a5d1 100644
--- a/cpp/csp/engine/RootEngine.cpp
+++ b/cpp/csp/engine/RootEngine.cpp
@@ -174,7 +174,7 @@ void RootEngine::runRealtime( DateTime end )
 
         if( !haveEvents )
         {
-            //We keep the ahveEvents flag in case there were events, but we only decided to execute
+            //We keep the haveEvents flag in case there were events, but we only decided to execute
             //timers in the previous cycle, then we shouldnt wait again ( which can actually lead to cases
             //where we miss triggers )
             DialectReleaseGIL release( this );

From baae54bd5e71958dec4bad26ecca4be396024138 Mon Sep 17 00:00:00 2001
From: Tim Paine <timothy.paine@cubistsystematic.com>
Date: Wed, 27 Mar 2024 10:28:18 -0400
Subject: [PATCH 21/21] clean up ci/cd code and ensure mac tests run

Signed-off-by: Tim Paine <timothy.paine@cubistsystematic.com>
---
 .github/workflows/build.yml | 66 ++++++++++++++++++-------------------
 1 file changed, 32 insertions(+), 34 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e7b7775cc..2530946e1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -233,12 +233,15 @@ jobs:
             # avoid unnecessary use of mac resources
             - is-full-run: false
               os: macos-12
+
             - is-full-run: false
               os: macos-14
               python-version: "3.8"
+
             - is-full-run: false
               os: macos-14
               python-version: "3.9"
+
             - is-full-run: false
               os: macos-14
               python-version: "3.10"
@@ -251,7 +254,7 @@ jobs:
           with:
             submodules: recursive
             fetch-depth: 0
-      
+
         - name: Set up Python ${{ matrix.python-version }}
           uses: ./.github/actions/setup-python
           with:
@@ -308,11 +311,11 @@ jobs:
             CIBW_ENVIRONMENT_WINDOWS: TODO="todo"
           if: ${{ matrix.os == 'windows-2022' }}
 
-        # Check dist files
+        ##########
+        # Common
         - name: Check Wheels
           run: make dist-check
 
-        # Upload artifacts
         - name: Upload Wheel
           uses: actions/upload-artifact@v4
           with:
@@ -358,15 +361,12 @@ jobs:
         - name: Install python dependencies
           run: make requirements
 
-        # Build SDist
         - name: Python SDist Steps
           run: make dist-py-sdist
 
-        # Check dist files
         - name: Check sdist
           run: make dist-check
 
-        # Upload artifacts
         - name: Upload SDist
           uses: actions/upload-artifact@v4
           with:
@@ -414,28 +414,26 @@ jobs:
             - os: macos-14
               python-version: "3.9"
 
-            # Exclude windows builds
+            # windows is slow, so dont build unless its a full run
             # - is-full-run: false
             #   os: windows-2022
 
-            # Exclude macOS builds for now
-            - os: macos-12
-              # is-full-run: false  # FIXME https://github.com/Point72/csp/issues/33
-
-            - os: macos-14
-              # is-full-run: false  # FIXME https://github.com/Point72/csp/issues/33
+            # avoid unnecessary use of mac resources
+            - is-full-run: false
+              os: macos-12
 
-            # Exclude Python 3.8, 3.10, 3.11 builds
             - is-full-run: false
-              python-version: 3.8
+              os: macos-14
+              python-version: "3.8"
 
             - is-full-run: false
-              python-version: 3.9
+              os: macos-14
+              python-version: "3.9"
 
             - is-full-run: false
+              os: macos-14
               python-version: "3.10"
 
-
       runs-on: ${{ matrix.os }}
 
       steps:
@@ -452,26 +450,29 @@ jobs:
         - name: Install python dependencies
           run: make requirements
 
+        - name: Download wheel
+          uses: actions/download-artifact@v4
+          with:
+            name: csp-dist-${{ runner.os }}-${{ runner.arch }}-${{ matrix.python-version }}
+
+        ########
+        # Linux
         - name: Install test dependencies (Linux)
           shell: bash
           run: sudo apt-get install graphviz
           if: ${{ runner.os == 'Linux' }}
 
+        - name: Install wheel (Linux)
+          run: python -m pip install -U *manylinux2014*.whl --target .
+          if: ${{ runner.os == 'Linux' }}
+
+        ########
+        # Macos
         - name: Install test dependencies (Mac)
           shell: bash
           run: brew install graphviz
           if: ${{ runner.os == 'macOS' }}
 
-        # Download artifact
-        - name: Download wheel
-          uses: actions/download-artifact@v4
-          with:
-            name: csp-dist-${{ runner.os }}-${{ runner.arch }}-${{ matrix.python-version }}
-
-        - name: Install wheel (Linux)
-          run: python -m pip install -U *manylinux2014*.whl --target .
-          if: ${{ runner.os == 'Linux' }}
-
         - name: Install wheel (OSX x86)
           run: python -m pip install -U *x86*.whl --target .
           if: ${{ runner.os == 'macOS' && runner.arch == 'X64' }}
@@ -480,11 +481,14 @@ jobs:
           run: python -m pip install -U *arm64*.whl --target .
           if: ${{ runner.os == 'macOS' && runner.arch == 'ARM64' }}
 
+        ########
+        # Windows
         - name: Install wheel (windows)
           run: python -m pip install -U (Get-ChildItem .\*.whl | Select-Object -Expand FullName) --target .
           if: ${{ runner.os == 'Windows' }}
 
-        # Run tests
+        ##########
+        # Common
         - name: Python Test Steps
           run: make test
 
@@ -532,17 +536,14 @@ jobs:
           with:
             cibuildwheel: 'cp39'
 
-        # Python
         - name: Install python dependencies
           run: make requirements
 
-        # Download sdist
         - uses: actions/download-artifact@v4
           with:
             name: csp-sdist
             path: dist/
 
-        # Install sdist
         - name: Install sdist
           run: python -m pip install -U -vvv dist/csp*.tar.gz --target .
           env:
@@ -550,7 +551,6 @@ jobs:
             VCPKG_DEFAULT_BINARY_CACHE: /home/runner/vcpkg_cache
             VCPKG_DOWNLOADS: /home/runner/vcpkg_download_cache
 
-        # Test sdist
         - name: Run tests against from-scratch sdist build
           run: make test
           env:
@@ -606,7 +606,6 @@ jobs:
           shell: bash
           run: sudo apt-get install graphviz
 
-        # Download artifact
         - name: Download wheel
           uses: actions/download-artifact@v4
           with:
@@ -618,7 +617,6 @@ jobs:
         - name: Install package - ${{ matrix.package }}
           run: python -m pip install -U "${{ matrix.package }}"
 
-        # Run tests
         - name: Python Test Steps
           run: make test TEST_ARGS="-k TestDBReader"
           if: ${{ contains( 'sqlalchemy', matrix.package )}}