Draft SMFL-based native canvas implementation

.github/workflows/CI.yml

@@ -18,6 +18,7 @@ jobs:
           - test-native-opt
           - test-examples
           # - test-cookiecutter
+      fail-fast: false
     env:
       CXX: ${{ matrix.cxx }}
       TEST_SET: ${{ matrix.test-set }}
@@ -27,14 +28,17 @@ jobs:
           submodules: 'recursive'
       - run: sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
       - run: sudo apt-get update -qq
-      - run: sudo apt-get install -qq g++-8 cmake build-essential python3-pip python3-virtualenv nodejs tar gzip libpthread-stubs0-dev libc6-dbg gdb
+      - run: sudo apt-get install -qq g++-8 cmake build-essential python3-pip python3-virtualenv nodejs tar gzip libpthread-stubs0-dev libsfml-dev libc6-dbg gdb
+      - run: sudo apt-get install python3-wheel -y
+      - run: pip3 install wheel
       - run: sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-8 90
       - run: git fetch origin master:refs/remotes/origin/master
       - run: make install-test-dependencies
       - run: ${CXX} --version
-      - run: |
-          source third-party/emsdk/emsdk_env.sh
-          make ${TEST_SET} CXX=${CXX}
+      - name: Run headless test
+        uses: GabrielBB/xvfb-action@v1
+        with:
+          run: bash -c "echo ${DISPLAY}; source third-party/emsdk/emsdk_env.sh; make ${{ matrix.test-set }} CXX=${{ matrix.cxx }};"
   test-web:
     name: Web Tests
     runs-on: ubuntu-18.04
@@ -43,6 +47,8 @@ jobs:
         with:
           submodules: 'recursive'
       - run: sudo apt-get install -qq g++-8 cmake build-essential python3-pip python3-virtualenv nodejs tar gzip libpthread-stubs0-dev libc6-dbg gdb
+      - run: sudo apt-get install python3-wheel -y
+      - run: pip3 install wheel
       - run: sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-8 90
       - run: make install-test-dependencies
       - name: Run headless test
@@ -62,15 +68,20 @@ jobs:
       - run: sudo apt-get update -qq
       - run: sudo apt-get install -qq g++-8
       - run: sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-8 90
-      - run: sudo apt-get install cmake build-essential python3-virtualenv python3-pip nodejs tar gzip libclang-7-dev llvm llvm-dev libllvm7 llvm-7 llvm-7-dev clang-7 libstdc++-7-dev # might have to happen after we update g++
+      - run: sudo apt-get install cmake build-essential python3-virtualenv python3-pip nodejs tar gzip libclang-7-dev llvm llvm-dev libllvm7 llvm-7 llvm-7-dev clang-7 libsfml-dev libstdc++-7-dev # might have to happen after we update g++
+      - run: sudo apt-get install python3-wheel -y
+      - run: pip3 install wheel
       - run: sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-7 90
       - run: sudo update-alternatives --install /usr/bin/llvm-config llvm-config /usr/bin/llvm-config-7 90
       - run: sudo update-alternatives --install /usr/bin/llvm-profdata llvm-profdata /usr/bin/llvm-profdata-7 90
       - run: sudo update-alternatives --install /usr/bin/llvm-cov llvm-cov /usr/bin/llvm-cov-7 90
       - run: git fetch origin master:refs/remotes/origin/master
       - run: make install-test-dependencies
       - run: export CXX=clang++-7 && make install-coverage-dependencies
-      - run: export CXX=clang++-7 && make coverage
+      - name: Run coverage test with headless xvfb
+        uses: GabrielBB/xvfb-action@v1
+        with:
+          run: bash -c "export CXX=clang++-7; make coverage;"
       - run: curl -s https://codecov.io/bash | bash
   test-documentation:
     name: Test Documentation Build

Dockerfile

@@ -37,6 +37,7 @@ RUN \
     libc6=2.27-3ubuntu1 \
     libc6-dev \
     libc6-dbg \
+    libsfml-dev \
     build-essential \
     xvfb \
     x11vnc \
@@ -60,6 +61,7 @@ RUN \
     libstdc++-8-dev \
     cmake \
     python-virtualenv \
+    python3-venv \
     python-pip-whl \
     python-pip \
     python-setuptools \
@@ -246,9 +248,9 @@ RUN \
   echo "installed karma-firefox-launcher"
 
 RUN \
-  pip install -r /opt/Empirical/third-party/requirements.txt \
+  pip3 install -r /opt/Empirical/third-party/requirements.txt \
     && \
-  echo "installed documentation build requirements"
+  echo "installed python3 requirements"
 
 # Perform any further action as an unprivileged user.
 # adapted from https://stackoverflow.com/a/27703359

doc/LICENSE.md

@@ -113,3 +113,28 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 This repository contains source code adapted from the LLVM Project, under the
 Apache License v2.0 with LLVM Exceptions. See https://llvm.org/LICENSE.txt for
 license information. SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception.
+
+===============================================================================
+
+This repository contains source code for css-color-parser-cpp.
+
+(c) Dean McNamee <[email protected]>, 2012.
+(c) Konstantin Käfer <[email protected]>, 2014.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+IN THE SOFTWARE.

doc/dev/getting-started.md

@@ -314,3 +314,24 @@ recipe:
     git status ## sanity check
     git push ## should fail
     git push --force ## override what's in GitHub's copy of the branch/pull request
+
+## How to Set Up X11 Display for SFML on Windows:
+1. Download MobaXterm
+2. Open a WSL-Ubuntu Session
+3. Hover over the XServer icon at the top right of the screen and note the DISPLAY value (X.X.X.X:X.X)
+4. Type at the command prompt:
+
+        export DISPLAY=X.X.X.X:X.X
+
+5. Run your desired programs!
+
+## How to Set Up X11 Display for SFML on HPCC:
+adapted from https://wiki.hpcc.msu.edu/display/[email protected]/2013/10
+1. specify display, start the Xvfb server, and save the process ID
+2. Run the following commands
+
+        export DISPLAY=":${SLURM_JOB_ID-1}"
+        rm -f "/tmp/.X11-unix/X${SLURM_JOB_ID-1}"
+        rm -f "/tmp/.X${SLURM_JOB_ID-1}-lock"
+        Xvfb "${DISPLAY}" -auth /dev/null/ &
+        export XVFB_PID=$!

doc/requirements.in

@@ -0,0 +1,6 @@
+sphinx==3.2.1
+exhale==0.2.3
+sphinx-rtd-theme==0.5.0
+coverxygen==1.5.0
+breathe==4.22.1
+myst-parser==0.12.9

doc/requirements.txt

@@ -1,6 +1,93 @@
-sphinx==3.2.1
-exhale==0.2.3
-sphinx-rtd-theme==0.5.0
-coverxygen==1.5.0
+#
+# This file is autogenerated by pip-compile
+# To update, run:
+#
+#    pip-compile requirements.in
+#
+alabaster==0.7.12
+    # via sphinx
+attrs==20.3.0
+    # via markdown-it-py
+babel==2.9.0
+    # via sphinx
+beautifulsoup4==4.9.3
+    # via bs4
 breathe==4.22.1
+    # via
+    #   -r requirements.in
+    #   exhale
+bs4==0.0.1
+    # via exhale
+certifi==2020.12.5
+    # via requests
+chardet==4.0.0
+    # via requests
+coverxygen==1.5.0
+    # via -r requirements.in
+docutils==0.16
+    # via
+    #   breathe
+    #   myst-parser
+    #   sphinx
+exhale==0.2.3
+    # via -r requirements.in
+idna==2.10
+    # via requests
+imagesize==1.2.0
+    # via sphinx
+jinja2==2.11.3
+    # via sphinx
+lxml==4.6.2
+    # via exhale
+markdown-it-py==0.5.8
+    # via myst-parser
+markupsafe==1.1.1
+    # via jinja2
 myst-parser==0.12.9
+    # via -r requirements.in
+packaging==20.9
+    # via sphinx
+pygments==2.8.0
+    # via sphinx
+pyparsing==2.4.7
+    # via packaging
+pytz==2021.1
+    # via babel
+pyyaml==5.4.1
+    # via myst-parser
+requests==2.25.1
+    # via sphinx
+six==1.15.0
+    # via
+    #   breathe
+    #   exhale
+snowballstemmer==2.1.0
+    # via sphinx
+soupsieve==2.2
+    # via beautifulsoup4
+sphinx-rtd-theme==0.5.0
+    # via -r requirements.in
+sphinx==3.2.1
+    # via
+    #   -r requirements.in
+    #   breathe
+    #   exhale
+    #   myst-parser
+    #   sphinx-rtd-theme
+sphinxcontrib-applehelp==1.0.2
+    # via sphinx
+sphinxcontrib-devhelp==1.0.2
+    # via sphinx
+sphinxcontrib-htmlhelp==1.0.3
+    # via sphinx
+sphinxcontrib-jsmath==1.0.1
+    # via sphinx
+sphinxcontrib-qthelp==1.0.3
+    # via sphinx
+sphinxcontrib-serializinghtml==1.1.4
+    # via sphinx
+urllib3==1.26.3
+    # via requests
+
+# The following packages are considered to be unsafe in a requirements file:
+# setuptools

include/emp/base/EMP_NAMESPACE.hpp

@@ -0,0 +1,10 @@
+#ifndef EMP_BASE_EMP_NAMESPACE_HPP
+#define EMP_BASE_EMP_NAMESPACE_HPP
+
+// use to allow for namespace substitions inside macros
+#ifndef EMP_NAMESPACE
+#define EMP_NAMESPACE_OBJLIKE emp
+#define EMP_NAMESPACE() emp
+#endif // #ifndef EMP_NAMESPACE
+
+#endif // #ifndef EMP_BASE_EMP_NAMESPACE_HPP

include/emp/base/Ptr.hpp

@@ -416,7 +416,9 @@ namespace emp {
     template <typename T2>
     Ptr(T2 * in_ptr, bool track=false) : BasePtr<TYPE>(in_ptr, UNTRACKED_ID)
     {
+      #ifndef UIT_VENDORIZE_EMP
       if (internal::ptr_debug) std::cout << "raw construct: " << ptr << ". track=" << track << std::endl;
+      #endif // #ifndef UIT_VENDORIZE_EMP
       emp_assert( (PtrIsConvertable<T2, TYPE>(in_ptr)) );
 
       // If this pointer is already active, link to it.
@@ -471,8 +473,10 @@ namespace emp {
     ~Ptr() {
       if (internal::ptr_debug) {
         std::cout << "destructing Ptr instance ";
+        #ifndef UIT_VENDORIZE_EMP
         if (ptr) std::cout << id << " (" << ptr << ")\n";
         else std::cout << "(nullptr)\n";
+        #endif // #ifndef UIT_VENDORIZE_EMP
       }
       Tracker().DecID(id);
     }

include/emp/base/_is_streamable.hpp

@@ -12,6 +12,9 @@
 #ifndef EMP_IS_STREAMABLE_HPP
 #define EMP_IS_STREAMABLE_HPP
 
+#include <type_traits>
+#include <utility>
+
 namespace emp {
 
 // adapted from https://stackoverflow.com/a/22759544

include/emp/base/always_assert.hpp

@@ -31,6 +31,7 @@
 #include <cstdlib>
 
 #include "_assert_trigger.hpp"
+#include "EMP_NAMESPACE.hpp"
 #include "macros.hpp"
 
 /// Helper macro used throughout...
@@ -41,7 +42,7 @@
   #define emp_always_assert_impl(...)                                          \
     do {                                                                       \
       !(EMP_GET_ARG_1(__VA_ARGS__, ~))                                         \
-      && emp::assert_trigger(                                                  \
+      && EMP_NAMESPACE()::assert_trigger(                                      \
         __FILE__, __LINE__,                                                    \
         EMP_STRINGIFY( EMP_GET_ARG_1(__VA_ARGS__, ~),  ),                      \
         EMP_WRAP_ARGS(emp_assert_TO_PAIR, __VA_ARGS__)                         \
@@ -53,7 +54,7 @@
   #define emp_always_assert_msvc_impl(TEST)                                    \
     do {                                                                       \
       !(TEST)                                                                  \
-      && emp::assert_trigger(__FILE__, __LINE__, #TEST, 0)                     \
+      && EMP_NAMESPACE()::assert_trigger(LE__, __LINE__, #TEST, 0)             \
       && (std::abort(), false);                                                \
     } while(0)
 
@@ -64,7 +65,7 @@
   #define emp_always_assert_impl(...)                                          \
     do {                                                                       \
       !(EMP_GET_ARG_1(__VA_ARGS__, ~))                                         \
-      && emp::assert_trigger(                                                  \
+      && EMP_NAMESPACE()::assert_trigger(                                      \
         __FILE__, __LINE__,                                                    \
         EMP_STRINGIFY( EMP_GET_ARG_1(__VA_ARGS__, ~) ),                        \
         EMP_WRAP_ARGS(emp_assert_TO_PAIR, __VA_ARGS__)                         \

include/emp/base/always_assert_warning.hpp

@@ -30,17 +30,18 @@
 #include <cstdlib>
 
 #include "_assert_trigger.hpp"
+#include "EMP_NAMESPACE.hpp"
 #include "macros.hpp"
 
 /// Helper macro used throughout...
 #define emp_assert_warning_TO_PAIR(X) EMP_STRINGIFY(X) , X
 
 #if defined( _MSC_VER )
 
-  #define emp_always_assert_warning_msvc_impl(TEST)                                    \
+  #define emp_always_assert_warning_msvc_impl(TEST)                            \
     do {                                                                       \
       !(TEST)                                                                  \
-      && emp::assert_trigger(__FILE__, __LINE__, #TEST, 0);                    \
+      && EMP_NAMESPACE()::assert_trigger(__FILE__, __LINE__, #TEST, 0);        \
     } while(0)
 
   #define emp_always_assert_warning_impl(TEST) \
@@ -51,7 +52,7 @@
   #define emp_always_assert_warning_impl(...)                                          \
     do {                                                                       \
       !(EMP_GET_ARG_1(__VA_ARGS__, ~))                                         \
-      && emp::assert_trigger(                                                  \
+      && EMP_NAMESPACE()::assert_trigger(                                      \
         __FILE__, __LINE__,                                                    \
         EMP_STRINGIFY( EMP_GET_ARG_1(__VA_ARGS__, ~) ),                        \
         EMP_WRAP_ARGS(emp_assert_warning_TO_PAIR, __VA_ARGS__)                 \