Merge pull request #752 from ngageoint/externals_20240920

Externals 20240920

externals/coda-oss/modules/c++/include/TestCase.h

@@ -215,7 +215,7 @@ inline int main(TFunc f)
 #define CODA_OSS_test_ne_(X1, X2) (((X1) != (X2)) && ((X2) != (X1))) // X1 != X2 means X2 != X1
 #define CODA_OSS_test_ne(X1, X2) (CODA_OSS_test_ne_(X1, X2) && !CODA_OSS_test_eq_(X1, X2))
 #define CODA_OSS_test_eq(X1, X2) (CODA_OSS_test_eq_(X1, X2) && !CODA_OSS_test_ne_(X1, X2))
-#define TEST_ASSERT_EQ(X1, X2) if (!CODA_OSS_test_eq((X1), (X2))) { CODA_OSS_test_diePrintf_eq_(X1, X2); }
+#define TEST_ASSERT_EQ(X1, X2) do { bool expr(CODA_OSS_test_eq((X1), (X2))); if (!expr) { CODA_OSS_test_diePrintf_eq_(X1, X2); } } while (0);
 #define TEST_ASSERT_EQ_MSG(msg, X1, X2) if (!CODA_OSS_test_eq((X1), (X2))) { CODA_OSS_test_diePrintf_eq_msg_(msg, X1, X2); }
 #define TEST_ASSERT_EQ_STR(X1, X2) TEST_ASSERT_EQ(std::string(X1), std::string(X2))
 #define TEST_ASSERT_NOT_EQ(X1, X2) if (!CODA_OSS_test_ne((X1), (X2))) { CODA_OSS_test_diePrintf_not_eq_(X1, X2); }

externals/coda-oss/modules/c++/sys/source/OSWin32.cpp

@@ -357,14 +357,19 @@ void sys::OSWin32::getAvailableCPUs(std::vector<int>& /*physicalCPUs*/,
 sys::SIMDInstructionSet sys::OSWin32::getSIMDInstructionSet() const
 {
     // https://learn.microsoft.com/en-us/windows/win32/api/processthreadsapi/nf-processthreadsapi-isprocessorfeaturepresent
+    // (these require Windows SDK (19041) or later)
+#ifdef PF_AVX512F_INSTRUCTIONS_AVAILABLE
     if (IsProcessorFeaturePresent(PF_AVX512F_INSTRUCTIONS_AVAILABLE))
     {
         return SIMDInstructionSet::AVX512F;
     }
+#endif
+#ifdef PF_AVX2_INSTRUCTIONS_AVAILABLE
     if (IsProcessorFeaturePresent(PF_AVX2_INSTRUCTIONS_AVAILABLE))
     {
         return SIMDInstructionSet::AVX2;
     }
+#endif
     if (IsProcessorFeaturePresent(PF_XMMI64_INSTRUCTIONS_AVAILABLE))
     {
         return SIMDInstructionSet::SSE2;

sync_externals.csh

@@ -21,7 +21,9 @@ git remote add -m main -f nitro_remote [email protected]:mdaus/nitro.git
 git subtree pull --prefix externals/coda-oss coda-oss_remote main --squash
 
 git subtree pull --prefix externals/nitro nitro_remote main --squash
-git rm -rf externals/nitro/externals
+# git is smart, so we only have to do this once and then future subtree pulls will never
+# pull these in
+# git rm -rf externals/nitro/externals
 
 # If when you do this command you git a merge conflict because a file that has been removed here has been updated in CODA-OSS, you just need to do a 'git rm <pathname>' to resolve the merge conflict.  Then a 'git commit'.
 # TODO: Make this script smart enough to do this.