merge changes

Author: Jeffrey Hurchalla

CMakeLists.txt

@@ -73,16 +73,18 @@ target_sources(hurchalla_factoring INTERFACE
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/hurchalla/factoring/is_prime.h>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/hurchalla/factoring/resource_intensive_api/FactorByTable32.h>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/hurchalla/factoring/resource_intensive_api/factorize_intensive_uint32.h>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/hurchalla/factoring/resource_intensive_api/IsPrimeIntensive.h>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/hurchalla/factoring/resource_intensive_api/is_prime_intensive.h>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/hurchalla/factoring/resource_intensive_api/IsPrimeTable.h>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/hurchalla/factoring/resource_intensive_api/is_prime_ultimate.h>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/hurchalla/factoring/detail/DualMontgomeryForm.h>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/hurchalla/factoring/detail/FactorizeStage2.h>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/hurchalla/factoring/detail/factorize_trialdivision.h>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/hurchalla/factoring/detail/factorize_wheel210.h>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/hurchalla/factoring/detail/impl_factorize.h>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/hurchalla/factoring/detail/impl_greatest_common_divisor.h>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/hurchalla/factoring/detail/impl_is_prime.h>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/hurchalla/factoring/detail/impl_is_prime_intensive.h>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/hurchalla/factoring/detail/ImplFactorByTable32.h>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/hurchalla/factoring/detail/ImplIsPrimeIntensive.h>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/hurchalla/factoring/detail/is_prime_bruteforce.h>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/hurchalla/factoring/detail/is_prime_miller_rabin.h>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/hurchalla/factoring/detail/is_prime_trialdivision.h>

build_tests.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# Copyright (c) 2020-2024 Jeffrey Hurchalla.
+# Copyright (c) 2020-2025 Jeffrey Hurchalla.
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at https://mozilla.org/MPL/2.0/.
@@ -11,7 +11,7 @@
 # Description of this script -----------
 # This is a working convenience script for invoking the testing builds and then
 # running the tests.
-# The syntax is 
+# The syntax is
 # ./build_tests [-c<compiler_name>] [-j<num_jobs>] [-r] [-a] [-u] [-t] [-m<Release|Debug|Profile>] [-l<standard_library_name>]
 #
 # -c allows you to select the compiler, rather than using the default.
@@ -177,7 +177,6 @@ if [ "${BASH_VERSINFO:-0}" -lt 4 ]; then
    exit 1
 fi
 
-
 while getopts ":m:l:c:j:h-:raut" opt; do
   case $opt in
     h)
@@ -541,7 +540,7 @@ if [ "${mode,,}" = "release" ]; then
             $gcc_static_analysis"  "${clang_static_analysis[@]}" \
             $cmake_cpp_compiler $cmake_c_compiler
     exit_on_failure
-    cmake --build ./$build_dir --config Release
+    cmake --build ./$build_dir $num_jobs --config Release
     exit_on_failure
     popd > /dev/null 2>&1
 elif [ "${mode,,}" = "debug" ]; then
@@ -558,7 +557,7 @@ elif [ "${mode,,}" = "debug" ]; then
             $gcc_static_analysis"  "${clang_static_analysis[@]}" \
             $cmake_cpp_compiler $cmake_c_compiler
     exit_on_failure
-    cmake --build ./$build_dir --config Debug
+    cmake --build ./$build_dir $num_jobs --config Debug
     exit_on_failure
     popd > /dev/null 2>&1
 elif [ "${mode,,}" = "profile" ]; then
@@ -573,7 +572,7 @@ elif [ "${mode,,}" = "profile" ]; then
             $use_inline_asm  $use_all_inline_asm" \
             $cmake_cpp_compiler $cmake_c_compiler
     exit_on_failure
-    cmake --build ./$build_dir --config RelWithDebInfo
+    cmake --build ./$build_dir $num_jobs --config RelWithDebInfo
     exit_on_failure
     popd > /dev/null 2>&1
 else

include/hurchalla/factoring/detail/ImplFactorByTable32.h

@@ -16,6 +16,7 @@
 #include <fstream>
 #include <exception>
 #include <type_traits>
+#include <limits>
 
 namespace hurchalla { namespace detail {
 
@@ -228,10 +229,12 @@ class ImplFactorByTable32
         for (std::size_t j=1; j<size_wheel_divs; ++j) {
             std::uint64_t wd = wheel_divs[j];
             std::uint64_t two_wd = wd + wd;
-            odd_coprime_sieve[wd/2] = 0;
+            odd_coprime_sieve[static_cast<std::size_t>(wd/2)] = 0;
             for (std::uint64_t i=wd*wd; i<wheel_size; i+=two_wd) {
                 HPBC_CONSTEXPR_ASSERT(i/2 < half_wheel_size);
-                odd_coprime_sieve[i/2] = 0;
+                static_assert((wheel_size-1)/2 <=
+                              std::numeric_limits<std::size_t>::max());
+                odd_coprime_sieve[static_cast<std::size_t>(i/2)] = 0;
             }
         }
 

include/hurchalla/factoring/detail/ImplIsPrimeIntensive.h

@@ -41,7 +41,7 @@ typename std::enable_if<
    (ut_numeric_limits<typename MontType::IntegerType>::digits==128), bool>::type
 operator()(const MontType& mf) const
 {
-    return is_prime_miller_rabin::call(mf);
+    return is_prime_miller_rabin::call_mont(mf);
 }