Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions reporting/accuracy/Jamfile.v2
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ using auto-index ;
project
: requirements
<include>../../include_private
<cxxstd>17
;

if $(is_unix)
Expand Down Expand Up @@ -81,42 +82,42 @@ rule all-tests {
local result ;
for local source in [ glob test*.cpp ]
{
result += [ run $(source) /boost/system//boost_system /boost/filesystem//boost_filesystem /boost/test//boost_unit_test_framework /boost/interprocess//boost_interprocess /boost/multiprecision//boost_multiprecision /boost/type_index//boost_type_index quadmath mpfr
result += [ run $(source) /boost/test//boost_unit_test_framework /boost/interprocess//boost_interprocess /boost/multiprecision//boost_multiprecision /boost/type_index//boost_type_index quadmath mpfr
: : :
[ check-target-builds has_gsl : <define>ALWAYS_TEST_DOUBLE : ]
<target-os>linux:<linkflags>-lpthread
<target-os>linux:<linkflags>-lrt
<toolset>gcc:<linkflags>$(OTHERFLAGS) ]
;
result += [ run $(source) /boost/system//boost_system /boost/filesystem//boost_filesystem /boost/test//boost_unit_test_framework /boost/interprocess//boost_interprocess /boost/multiprecision//boost_multiprecision /boost/type_index//boost_type_index quadmath mpfr
result += [ run $(source) /boost/test//boost_unit_test_framework /boost/interprocess//boost_interprocess /boost/multiprecision//boost_multiprecision /boost/type_index//boost_type_index quadmath mpfr
: : : [ check-target-builds has_cxx17_cmath : <define>TEST_CXX17_CMATH : <build>no ]
<target-os>linux:<linkflags>-lpthread
<target-os>linux:<linkflags>-lrt
<toolset>gcc:<linkflags>$(OTHERFLAGS)
: $(source:B)_cxx17_cmath ]
;
result += [ run $(source) /boost/system//boost_system /boost/filesystem//boost_filesystem /boost/test//boost_unit_test_framework /boost/interprocess//boost_interprocess /boost/multiprecision//boost_multiprecision /boost/type_index//boost_type_index quadmath mpfr
result += [ run $(source) /boost/test//boost_unit_test_framework /boost/interprocess//boost_interprocess /boost/multiprecision//boost_multiprecision /boost/type_index//boost_type_index quadmath mpfr
: : : [ check-target-builds has_c99_cmath : <define>TEST_C99 : <build>no ]
<target-os>linux:<linkflags>-lpthread
<target-os>linux:<linkflags>-lrt
<toolset>gcc:<linkflags>$(OTHERFLAGS)
: $(source:B)_c99 ]
;
result += [ run $(source) /boost/system//boost_system /boost/filesystem//boost_filesystem /boost/test//boost_unit_test_framework /boost/interprocess//boost_interprocess /boost/multiprecision//boost_multiprecision /boost/type_index//boost_type_index gsl gslcblas
result += [ run $(source) /boost/test//boost_unit_test_framework /boost/interprocess//boost_interprocess /boost/multiprecision//boost_multiprecision /boost/type_index//boost_type_index gsl gslcblas
: : : [ check-target-builds has_gsl : <define>TEST_GSL : <build>no ]
<target-os>linux:<linkflags>-lpthread
<target-os>linux:<linkflags>-lrt
<toolset>gcc:<linkflags>$(OTHERFLAGS)
: $(source:B)_gsl ]
;
result += [ run $(source) /boost/system//boost_system /boost/filesystem//boost_filesystem /boost/test//boost_unit_test_framework /boost/interprocess//boost_interprocess /boost/multiprecision//boost_multiprecision /boost/type_index//boost_type_index Rmath
result += [ run $(source) /boost/test//boost_unit_test_framework /boost/interprocess//boost_interprocess /boost/multiprecision//boost_multiprecision /boost/type_index//boost_type_index Rmath
: : : [ check-target-builds has_rmath : <define>TEST_RMATH : <build>no ]
<target-os>linux:<linkflags>-lpthread
<target-os>linux:<linkflags>-lrt
<toolset>gcc:<linkflags>$(OTHERFLAGS)
: $(source:B)_rmath ]
;
result += [ run $(source) /boost/system//boost_system /boost/filesystem//boost_filesystem /boost/test//boost_unit_test_framework /boost/interprocess//boost_interprocess /boost/multiprecision//boost_multiprecision /boost/type_index//boost_type_index cephes_double
result += [ run $(source) /boost/test//boost_unit_test_framework /boost/interprocess//boost_interprocess /boost/multiprecision//boost_multiprecision /boost/type_index//boost_type_index cephes_double
: : : [ check-target-builds $(here)/third_party/cephes_double/acosh.c : <define>TEST_CEPHES <source>cephes_double : <build>no ]
<target-os>linux:<linkflags>-lpthread
<target-os>linux:<linkflags>-lrt
Expand Down
14 changes: 7 additions & 7 deletions reporting/accuracy/handle_test_result.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
#include <boost/lexical_cast.hpp>
#include <boost/regex.hpp>
#include <boost/test/test_tools.hpp>
#include <boost/filesystem.hpp>
#include <boost/filesystem/fstream.hpp>
#include <filesystem>
#include <fstream>
#include <boost/interprocess/sync/named_mutex.hpp>
#include <boost/interprocess/sync/scoped_lock.hpp>
#include <boost/math/special_functions/fpclassify.hpp>
Expand All @@ -30,22 +30,22 @@ inline std::string sanitize_string(const std::string& s)
}

static std::string content;
boost::filesystem::path path_to_content;
std::filesystem::path path_to_content;

struct content_loader
{
boost::interprocess::named_mutex mu;
boost::interprocess::scoped_lock<boost::interprocess::named_mutex> lock;
content_loader() : mu(boost::interprocess::open_or_create, "handle_test_result"), lock(mu)
{
boost::filesystem::path p(__FILE__);
std::filesystem::path p(__FILE__);
p = p.parent_path();
p /= "doc";
p /= "accuracy_tables.qbk";
path_to_content = p;
if(boost::filesystem::exists(p))
if(std::filesystem::exists(p))
{
boost::filesystem::ifstream is(p);
std::ifstream is(p);
if(is.good())
{
do
Expand All @@ -59,7 +59,7 @@ struct content_loader
}
~content_loader()
{
boost::filesystem::ofstream os(path_to_content);
std::ofstream os(path_to_content);
os << content;
}
void instantiate()const
Expand Down
29 changes: 15 additions & 14 deletions reporting/performance/Jamfile.v2
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import predef
project
: requirements
<include>../../include_private
<cxxstd>17
;

if $(is_unix)
Expand Down Expand Up @@ -97,13 +98,13 @@ lib dcdflib : $(here)/third_party/dcdflib/$(DCDFLIB_SOURCE)

explicit dcdflib ;

obj table_helper : table_helper.cpp /boost/filesystem//boost_filesystem /boost/interprocess//boost_interprocess ;
obj table_helper : table_helper.cpp /boost/interprocess//boost_interprocess ;

rule all-tests {
local result ;
for local source in [ glob test*.cpp ]
{
result += [ run $(source) /boost/regex//boost_regex /boost/system//boost_system /boost/filesystem//boost_filesystem /boost/multiprecision//boost_multiprecision /boost/filesystem//boost_filesystem table_helper
result += [ run $(source) /boost/regex//boost_regex /boost/multiprecision//boost_multiprecision table_helper
: : : <variant>release <include>../../test
[ check-target-builds ../accuracy//has_c99_cmath : <define>TEST_C99 ]
[ check-target-builds has_libstdcxx_tr1 : <define>TEST_LIBSTDCXX ]
Expand All @@ -122,35 +123,35 @@ rule all-tests {
# Special cases to test different compiler options,
# cbrt first as an example of a trivial function:
#
run test_cbrt.cpp /boost/regex//boost_regex /boost/system//boost_system /boost/filesystem//boost_filesystem table_helper
run test_cbrt.cpp /boost/regex//boost_regex table_helper
: : : debug <define>COMPILER_COMPARISON_TABLES [ predef-require "BOOST_COMP_MSVC" ] <address-model>32 : test_cbrt_msvc_debug ;
run test_cbrt.cpp /boost/regex//boost_regex /boost/system//boost_system /boost/filesystem//boost_filesystem table_helper
run test_cbrt.cpp /boost/regex//boost_regex table_helper
: : : release <define>COMPILER_COMPARISON_TABLES [ predef-require "BOOST_COMP_MSVC" ] <cxxflags>-Ox <address-model>32 : test_cbrt_msvc_release_32 ;
run test_cbrt.cpp /boost/regex//boost_regex /boost/system//boost_system /boost/filesystem//boost_filesystem table_helper
run test_cbrt.cpp /boost/regex//boost_regex table_helper
: : : release <define>COMPILER_COMPARISON_TABLES [ predef-require "BOOST_COMP_MSVC" ] <cxxflags>-Ox <address-model>64 : test_cbrt_msvc_release_64 ;
run test_cbrt.cpp /boost/regex//boost_regex /boost/system//boost_system /boost/filesystem//boost_filesystem table_helper
run test_cbrt.cpp /boost/regex//boost_regex table_helper
: : : release <define>COMPILER_COMPARISON_TABLES [ check-target-builds is_intel_win : : <build>no ] <toolset>intel:<cxxflags>-Ox <address-model>64 : test_cbrt_intel_release ;
#
# Now jn as a little more complex:
#
run test_jn.cpp /boost/regex//boost_regex /boost/system//boost_system /boost/filesystem//boost_filesystem table_helper
run test_jn.cpp /boost/regex//boost_regex table_helper
: : : debug <define>COMPILER_COMPARISON_TABLES <include>../../test [ predef-require "BOOST_COMP_MSVC" ] <address-model>32 : test_jn_msvc_debug ;
run test_jn.cpp /boost/regex//boost_regex /boost/system//boost_system /boost/filesystem//boost_filesystem table_helper
run test_jn.cpp /boost/regex//boost_regex table_helper
: : : release <define>COMPILER_COMPARISON_TABLES <include>../../test [ predef-require "BOOST_COMP_MSVC" ] <cxxflags>-Ox <address-model>32 : test_jn_msvc_release_32 ;
run test_jn.cpp /boost/regex//boost_regex /boost/system//boost_system /boost/filesystem//boost_filesystem table_helper
run test_jn.cpp /boost/regex//boost_regex table_helper
: : : release <define>COMPILER_COMPARISON_TABLES <include>../../test [ predef-require "BOOST_COMP_MSVC" ] <cxxflags>-Ox <address-model>64 : test_jn_msvc_release_64 ;
run test_jn.cpp /boost/regex//boost_regex /boost/system//boost_system /boost/filesystem//boost_filesystem table_helper
run test_jn.cpp /boost/regex//boost_regex table_helper
: : : release <define>COMPILER_COMPARISON_TABLES <include>../../test [ check-target-builds is_intel_win : : <build>no ] <address-model>64 : test_jn_intel_release ;
#
# Then something really expensive, like the inverse-incomplete-beta:
#
run test_ibeta_inv.cpp /boost/regex//boost_regex /boost/system//boost_system /boost/filesystem//boost_filesystem table_helper
run test_ibeta_inv.cpp /boost/regex//boost_regex table_helper
: : : debug <define>COMPILER_COMPARISON_TABLES <include>../../test [ predef-require "BOOST_COMP_MSVC" ] <address-model>32 : test_ibeta_inv_msvc_debug ;
run test_ibeta_inv.cpp /boost/regex//boost_regex /boost/system//boost_system /boost/filesystem//boost_filesystem table_helper
run test_ibeta_inv.cpp /boost/regex//boost_regex table_helper
: : : release <define>COMPILER_COMPARISON_TABLES <include>../../test [ predef-require "BOOST_COMP_MSVC" ] <cxxflags>-Ox <address-model>32 : test_ibeta_inv_msvc_release_32 ;
run test_ibeta_inv.cpp /boost/regex//boost_regex /boost/system//boost_system /boost/filesystem//boost_filesystem table_helper
run test_ibeta_inv.cpp /boost/regex//boost_regex table_helper
: : : release <define>COMPILER_COMPARISON_TABLES <include>../../test [ predef-require "BOOST_COMP_MSVC" ] <cxxflags>-Ox <address-model>64 : test_ibeta_inv_msvc_release_64 ;
run test_ibeta_inv.cpp /boost/regex//boost_regex /boost/system//boost_system /boost/filesystem//boost_filesystem table_helper
run test_ibeta_inv.cpp /boost/regex//boost_regex table_helper
: : : release <define>COMPILER_COMPARISON_TABLES <include>../../test [ check-target-builds is_intel_win : : <build>no ] <toolset>intel:<cxxflags>-Ox <address-model>64 : test_ibeta_inv_intel_release ;

test-suite report_gen : [ all-tests ] test_cbrt_msvc_debug test_cbrt_msvc_release_32 test_cbrt_msvc_release_64 test_cbrt_intel_release
Expand Down
14 changes: 7 additions & 7 deletions reporting/performance/table_helper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

#include <boost/regex.hpp>
#include <boost/lexical_cast.hpp>
#include <boost/filesystem.hpp>
#include <boost/filesystem/fstream.hpp>
#include <filesystem>
#include <fstream>
#include <boost/interprocess/sync/named_mutex.hpp>
#include <boost/interprocess/sync/scoped_lock.hpp>
#include <vector>
Expand Down Expand Up @@ -45,7 +45,7 @@ std::string format_precision(double val, int digits)
}

static std::string content;
boost::filesystem::path path_to_content;
std::filesystem::path path_to_content;

struct content_loader
{
Expand All @@ -54,14 +54,14 @@ struct content_loader
{
boost::interprocess::named_mutex mu(boost::interprocess::open_or_create, "handle_test_result");
boost::interprocess::scoped_lock<boost::interprocess::named_mutex> lock(mu);
boost::filesystem::path p(__FILE__);
std::filesystem::path p(__FILE__);
p = p.parent_path();
p /= "doc";
p /= "performance_tables.qbk";
path_to_content = p;
if(boost::filesystem::exists(p))
if(std::filesystem::exists(p))
{
boost::filesystem::ifstream is(p);
std::ifstream is(p);
if(is.good())
{
do
Expand All @@ -82,7 +82,7 @@ struct content_loader
//
// Write out the results:
//
boost::filesystem::ofstream os(path_to_content);
std::ofstream os(path_to_content);
os << content;
}
void instantiate()const
Expand Down
Loading