Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes in CMake and Bertini #3536

Merged
merged 4 commits into from
Oct 29, 2024
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
2 changes: 0 additions & 2 deletions M2/Macaulay2/e/newdelete.hpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
#ifndef NEWDELETE_H
#define NEWDELETE_H 1

#define GC_REDIRECT_TO_LOCAL // enable thread-local allocation

#include "M2mem.h" // for freemem, getmem, outofmem2
#include "debug.h" // for TRAPCHK, TRAPCHK_SIZE

Expand Down
5 changes: 4 additions & 1 deletion M2/Macaulay2/m2/examples.m2
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,10 @@ isCapturable = (inputs, pkg, isTest) -> (
inputs = replace("-\\*.*?\\*-", "", inputs);
-- TODO: remove this when the effects of capture on other packages is reviewed
(isTest or match({"FirstPackage", "Macaulay2Doc"}, pkg#"pkgname"))
and not match({"MultiprojectiveVarieties", "EngineTests","ThreadedGB","RunExternalM2","SpecialFanoFourfolds"}, pkg#"pkgname")
and not match({
"FastMinors", "TerraciniLoci",
"MultiprojectiveVarieties", "SpecialFanoFourfolds",
"EngineTests", "ThreadedGB", "RunExternalM2"}, pkg#"pkgname")
and not (match({"Cremona"}, pkg#"pkgname") and version#"pointer size" == 4)
-- FIXME: these are workarounds to prevent bugs, in order of priority for being fixed:
and not match("(gbTrace|NAGtrace)", inputs) -- cerr/cout directly from engine isn't captured
Expand Down
2 changes: 1 addition & 1 deletion M2/Macaulay2/packages/Bertini.m2
Original file line number Diff line number Diff line change
Expand Up @@ -2115,7 +2115,7 @@ importParameterFile(String) := o ->(aString)->(
if o.NameParameterFile===3 then NPF="random_values";
aString=aString|NPF;
if false===fileExists aString
then error"The file "|NPF|" does not exist at "|aString|". ";
then error("The file "|NPF|" does not exist at "|aString|".");
getLines:=apply(lines get (aString),i->select("[0-9e.+-]+",i)); -- grabs all lines of the solution file and selects desired words
expectedNumberOfParameters:=value (getLines_0_0);
getLines=drop(getLines,2);
Expand Down
2 changes: 1 addition & 1 deletion M2/cmake/check-libraries.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ else()
endif()

if(FLINT_FOUND)
set(CMAKE_REQUIRED_INCLUDES "${FLINT_INCLUDE_DIR}")
set(CMAKE_REQUIRED_INCLUDES "${FLINT_INCLUDE_DIR};${GMP_INCLUDE_DIRS}")
check_include_files(flint/nmod.h HAVE_FLINT_NMOD_H)
check_include_files(flint/arb.h HAVE_FLINT_ARB_H)
else()
Expand Down
Loading