From 96b0e88595aa4f741e6320753ca2f1ab0b1431a1 Mon Sep 17 00:00:00 2001
From: Matthew Andres Moreno <mmore500.login+gpg@gmail.com>
Date: Thu, 13 Oct 2022 05:48:14 -0700
Subject: [PATCH] Remove straggler unvendorized includes

---
 include/uit/ducts/proc/impl/backend/PooledBackEnd.hpp |  4 ++--
 include/uitsl/debug/OccupancyCaps.hpp                 |  2 --
 include/uitsl/fetch/fetch_native.hpp                  |  6 +++++-
 include/uitsl/math/math_utils.hpp                     | 10 ++++++++--
 include/uitsl/mpi/mpi_audit.hpp                       |  2 +-
 include/uitsl/mpi/status_utils.hpp                    |  5 ++---
 include/uitsl/parallel/ThreadIbarrier.hpp             |  2 --
 7 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/include/uit/ducts/proc/impl/backend/PooledBackEnd.hpp b/include/uit/ducts/proc/impl/backend/PooledBackEnd.hpp
index 716acedd48..ffb6c041f6 100644
--- a/include/uit/ducts/proc/impl/backend/PooledBackEnd.hpp
+++ b/include/uit/ducts/proc/impl/backend/PooledBackEnd.hpp
@@ -6,8 +6,8 @@
 
 #include "../../../../../../third-party/Empirical/third-party/robin-hood-hashing/src/include/robin_hood.h"
 
-#include "../../../../../../third-party/Empirical/include/emp/base/assert.hpp"
-#include "../../../../../../third-party/Empirical/include/emp/datastructs/tuple_utils.hpp"
+#include "../../../../../uit_emp/base/assert.hpp"
+#include "../../../../../uit_emp/datastructs/tuple_utils.hpp"
 
 #include "../../../../setup/InterProcAddress.hpp"
 
diff --git a/include/uitsl/debug/OccupancyCaps.hpp b/include/uitsl/debug/OccupancyCaps.hpp
index f885785c7d..0278d78ce3 100644
--- a/include/uitsl/debug/OccupancyCaps.hpp
+++ b/include/uitsl/debug/OccupancyCaps.hpp
@@ -8,8 +8,6 @@
 #include <tuple>
 #include <unordered_map>
 
-#include "../../../third-party/Empirical/include/emp/tools/string_utils.hpp"
-
 #include "OccupancyCap.hpp"
 
 namespace uitsl {
diff --git a/include/uitsl/fetch/fetch_native.hpp b/include/uitsl/fetch/fetch_native.hpp
index 5d09ef2888..67a99e139e 100644
--- a/include/uitsl/fetch/fetch_native.hpp
+++ b/include/uitsl/fetch/fetch_native.hpp
@@ -11,7 +11,7 @@
 
 #include <curl/curl.h>
 
-#include "../../../third-party/Empirical/include/emp/base/always_assert.hpp"
+#include "../../uit_emp/base/always_assert.hpp"
 
 #include "../debug/err_verify.hpp"
 #include "../nonce/ScopeGuard.hpp"
@@ -20,6 +20,8 @@
 #include "make_temp_filepath.hpp"
 #include "resolve_fetched_filename.hpp"
 
+#include "../../uit_emp/vendorization/push_assert_macros.hh"
+
 namespace uitsl {
 
 /*
@@ -97,4 +99,6 @@ inline std::filesystem::path fetch_native( const std::string& url ) {
 
 } // namespace uitsl
 
+#include "../../uit_emp/vendorization/pop_assert_macros.hh"
+
 #endif // #ifndef UITSL_FETCH_FETCH_NATIVE_HPP_INCLUDE
diff --git a/include/uitsl/math/math_utils.hpp b/include/uitsl/math/math_utils.hpp
index df9c73218c..d58de455cd 100644
--- a/include/uitsl/math/math_utils.hpp
+++ b/include/uitsl/math/math_utils.hpp
@@ -3,21 +3,25 @@
 #define UITSL_MATH_MATH_UTILS_HPP_INCLUDE
 
 #include <bitset>
+#include <cassert>
 #include <cmath>
 #include <limits>
 #include <ratio>
 #include <stddef.h>
 
+#include "../../uit_emp/base/assert.hpp"
 #include "../../uit_emp/math/math.hpp"
 
 #include "../debug/safe_cast.hpp"
 
+#include "../../uit_emp/vendorization/push_assert_macros.hh"
+
 namespace uitsl {
 
 template<typename ...Args> auto sum(Args ...args) { return (args + ...); }
 
 inline size_t mod(int in_val, const size_t mod_val) {
-  emp_assert(mod_val > 0);
+  assert(mod_val > 0);
   const int signed_mod_val = std::min(
     safe_cast<size_t>(std::numeric_limits<int>::max()),
     mod_val
@@ -27,7 +31,7 @@ inline size_t mod(int in_val, const size_t mod_val) {
 }
 
 inline size_t circular_index(const size_t pos, const size_t len, const int diff) {
-  emp_assert(len > 0);
+  assert(len > 0);
   return (pos + mod(diff, len)) % len;
 }
 
@@ -81,4 +85,6 @@ size_t sidebyside_hash(const size_t top, const size_t bottom) {
 
 } // namespace uitsl
 
+#include "../../uit_emp/vendorization/pop_assert_macros.hh"
+
 #endif // #ifndef UITSL_MATH_MATH_UTILS_HPP_INCLUDE
diff --git a/include/uitsl/mpi/mpi_audit.hpp b/include/uitsl/mpi/mpi_audit.hpp
index c4b63e8d74..52724c1b10 100644
--- a/include/uitsl/mpi/mpi_audit.hpp
+++ b/include/uitsl/mpi/mpi_audit.hpp
@@ -4,7 +4,7 @@
 
 #include <mpi.h>
 
-#include "../../../third-party/Empirical/include/emp/base/assert.hpp"
+#include "../../uit_emp/base/assert.hpp"
 
 #include "name_mpi_error.hpp"
 
diff --git a/include/uitsl/mpi/status_utils.hpp b/include/uitsl/mpi/status_utils.hpp
index 88f11a2017..ca6695979a 100644
--- a/include/uitsl/mpi/status_utils.hpp
+++ b/include/uitsl/mpi/status_utils.hpp
@@ -2,13 +2,12 @@
 #ifndef UITSL_MPI_STATUS_UTILS_HPP_INCLUDE
 #define UITSL_MPI_STATUS_UTILS_HPP_INCLUDE
 
+#include <cassert>
 #include <sstream>
 #include <string>
 
 #include <mpi.h>
 
-#include "../../../third-party/Empirical/include/emp/base/assert.hpp"
-
 #include "../utility/print_utils.hpp"
 
 #include "audited_routines.hpp"
@@ -23,7 +22,7 @@ inline int get_count(const MPI_Status& status, const MPI_Datatype& datatype) {
     datatype, // MPI_Datatype datatype: datatype of each receive buffer element
     &res // int *count: number of received elements (integer)
   );
-  emp_assert( res != MPI_UNDEFINED );
+  assert( res != MPI_UNDEFINED );
   return res;
 }
 
diff --git a/include/uitsl/parallel/ThreadIbarrier.hpp b/include/uitsl/parallel/ThreadIbarrier.hpp
index 95db7f70ae..a930b5ef2d 100644
--- a/include/uitsl/parallel/ThreadIbarrier.hpp
+++ b/include/uitsl/parallel/ThreadIbarrier.hpp
@@ -10,8 +10,6 @@
 #include <stddef.h>
 #include <unordered_map>
 
-#include "../../../third-party/Empirical/include/emp/base/assert.hpp"
-
 #include "../debug/OncePerThreadChecker.hpp"
 
 #include "ThreadMap.hpp"