Skip to content

ParFORM: fix #525 #530

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.

Sign up for GitHub

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

Merged
tueda merged 1 commit into from
Nov 14, 2024
Merged

ParFORM: fix #525 #530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 17 additions & 0 deletions check/fixes.frm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2841,6 +2841,23 @@ print;
assert succeeded?
assert result("F") =~ expr("5000")
*--#] Issue508 :
*--#[ Issue525 :
#:threadbucketsize 5
#:processbucketsize 5
S x;
L F = (1-x)^100;
L F1 = 1;
L F2 = 1;
.sort
#define x "0"
if (expression(F1)) redefine x "1";
.sort
id x = `x';
P F;
.end
assert succeeded?
assert result("F") =~ expr("0")
*--#] Issue525 :
*--#[ Issue563 :
#: SubTermsInSmall 50

Expand Down
5 changes: 0 additions & 5 deletions sources/execute.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -875,11 +875,6 @@ WORD DoExecute(WORD par, WORD skip)
RetCode = PF_BroadcastModifiedDollars();
if ( RetCode ) return RetCode;
}
/* Broadcast redefined preprocessor variables. */
if ( AC.numpfirstnum > 0 ) {
RetCode = PF_BroadcastRedefinedPreVars();
if ( RetCode ) return RetCode;
}
/* Broadcast the list of objects converted to symbols in AM.sbufnum. */
if ( AC.topolynomialflag & TOPOLYNOMIALFLAG ) {
RetCode = PF_BroadcastCBuf(AM.sbufnum);
Expand Down
10 changes: 10 additions & 0 deletions sources/parallel.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1768,6 +1768,11 @@ int PF_Processor(EXPRESSIONS e, WORD i, WORD LastExpression)
/* Now handle redefined preprocessor variables. */
if ( AC.numpfirstnum > 0 ) PF_UnpackRedefinedPreVars();
}
/* Broadcast redefined preprocessor variables. */
if ( AC.numpfirstnum > 0 ) {
int RetCode = PF_BroadcastRedefinedPreVars();
if ( RetCode ) return RetCode;
}
if ( ! AC.OldParallelStats ) {
/* Now we can calculate AT.SS->GenTerms from the statistics of the slaves. */
LONG genterms = 0;
Expand Down Expand Up @@ -1917,6 +1922,11 @@ int PF_Processor(EXPRESSIONS e, WORD i, WORD LastExpression)
/* Now handle redefined preprocessor variables. */
if ( AC.numpfirstnum > 0 ) PF_PackRedefinedPreVars();
PF_LongSingleSend(MASTER, PF_ENDSORT_MSGTAG);
/* Broadcast redefined preprocessor variables. */
if ( AC.numpfirstnum > 0 ) {
int RetCode = PF_BroadcastRedefinedPreVars();
if ( RetCode ) return RetCode;
}
/*
#] Collect (stats,prepro...) :

Expand Down