diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix raptor trouble

Browse Source
This commit is contained in:
Vítor Santos Costa 2014-02-09 22:17:36 +00:00
parent a012017635
commit 034878ab88
3 changed files with 41 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
C/grow.c
View File

@ -230,7 +230,7 @@ static CELL
worker_p_binding(int worker_p, CELL *aux_ptr)
{
CACHE_REGS
if (aux_ptr > H) {
if (aux_ptr > HR) {
CELL reg = REMOTE_ThreadHandle(worker_p).current_yaam_regs->LCL0_[aux_ptr-LCL0];
reg = AdjustGlobTerm(reg PASS_REGS);
return reg;
@ -255,7 +255,7 @@ RestoreTrail(int worker_p USES_REGS)
if (aux_tr < TR){
Yap_Error(SYSTEM_ERROR, TermNil, "oops");
}
Yap_NEW_MAHASH((ma_h_inner_struct *)H PASS_REGS);
Yap_NEW_MAHASH((ma_h_inner_struct *)HR PASS_REGS);
while (TR != aux_tr) {
CELL aux_cell = TrailTerm(--aux_tr);
if (IsVarTerm(aux_cell)) {

43
configure vendored
View File

@ -4490,6 +4490,10 @@ _ACEOF
then
use_malloc="no"
fi
if test "$orparallelism" = threads
then
threads="yes"
fi
tabling="no"
fi
@ -6507,6 +6511,12 @@ else
ENABLE_R="@# "
fi
if test -e "$srcdir"/packages/raptor/Makefile.in; then
ENABLE_RAPTOR=""
else
ENABLE_RAPTOR="@# "
fi
if test -e "$srcdir"/packages/RDF/Makefile.in; then
ENABLE_RDF=""
else
@ -7193,22 +7203,11 @@ if test "$threads" = "yes"
YAP_EXTRAS="$YAP_EXTRAS -D_GNU_SOURCE"
fi
case "$orparallelism" in
sba)
sba|a-cow|copy)
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "--or-parallelism=sba incompatible with threads
See \`config.log' for more details" "$LINENO" 5; }
;;
a-cow)
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "--or-parallelism=a-cow incompatible with threads
See \`config.log' for more details" "$LINENO" 5; }
;;
copy)
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "--or-parallelism=copy incompatible with threads
as_fn_error $? "--or-parallelism=$orparallelism incompatible with threads
See \`config.log' for more details" "$LINENO" 5; }
;;
yes|threads)
@ -7223,9 +7222,6 @@ else
a-cow)
YAP_EXTRAS="$YAP_EXTRAS -DYAPOR_COW=1"
;;
threads)
YAP_EXTRAS="$YAP_EXTRAS -DYAPOR_THREADS=1"
;;
yes|copy)
YAP_EXTRAS="$YAP_EXTRAS -DYAPOR_COPY=1"
;;
@ -11754,7 +11750,7 @@ else
JAVA_TEST=Test.java
CLASS_TEST=Test.class
cat << \EOF > $JAVA_TEST
/* #line 11757 "configure" */
/* #line 11753 "configure" */
public class Test {
}
EOF
@ -11930,7 +11926,7 @@ EOF
if uudecode$EXEEXT Test.uue; then
ac_cv_prog_uudecode_base64=yes
else
echo "configure: 11933: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
echo "configure: 11929: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
echo "configure: failed file was:" >&5
cat Test.uue >&5
ac_cv_prog_uudecode_base64=no
@ -12061,7 +12057,7 @@ else
JAVA_TEST=Test.java
CLASS_TEST=Test.class
cat << \EOF > $JAVA_TEST
/* #line 12064 "configure" */
/* #line 12060 "configure" */
public class Test {
}
EOF
@ -12096,7 +12092,7 @@ JAVA_TEST=Test.java
CLASS_TEST=Test.class
TEST=Test
cat << \EOF > $JAVA_TEST
/* [#]line 12099 "configure" */
/* [#]line 12095 "configure" */
public class Test {
public static void main (String args[]) {
System.exit (0);
@ -12960,6 +12956,8 @@ fi
if test -e "$srcdir"/packages/raptor/Makefile.in; then
ENABLE_RAPTOR=""
@ -14408,6 +14406,8 @@ fi
else
ENABLE_RAPTOR="@# "
fi
@ -16542,4 +16542,3 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi

33
configure.in
View File

@ -316,6 +316,10 @@ else
then
use_malloc="no"
fi
if test "$orparallelism" = threads
then
threads="yes"
fi
tabling="no"
fi
@ -721,6 +725,12 @@ else
ENABLE_R="@# "
fi
if test -e "$srcdir"/packages/raptor/Makefile.in; then
ENABLE_RAPTOR=""
else
ENABLE_RAPTOR="@# "
fi
if test -e "$srcdir"/packages/RDF/Makefile.in; then
ENABLE_RDF=""
else
@ -1140,19 +1150,12 @@ if test "$threads" = "yes"
if test "$GCC" = "yes"
then
YAP_EXTRAS="$YAP_EXTRAS -D_GNU_SOURCE"
fi
fi
case "$orparallelism" in
sba)
sba|a-cow|copy)
AC_MSG_FAILURE(
[--or-parallelism=sba incompatible with threads])
;;
a-cow)
AC_MSG_FAILURE(
[--or-parallelism=a-cow incompatible with threads])
;;
copy)
AC_MSG_FAILURE(
[--or-parallelism=copy incompatible with threads])
[--or-parallelism=$orparallelism incompatible with threads]
)
;;
yes|threads)
YAP_EXTRAS="$YAP_EXTRAS -DYAPOR_THREADS=1"
@ -1166,9 +1169,6 @@ else
a-cow)
YAP_EXTRAS="$YAP_EXTRAS -DYAPOR_COW=1"
;;
threads)
YAP_EXTRAS="$YAP_EXTRAS -DYAPOR_THREADS=1"
;;
yes|copy)
YAP_EXTRAS="$YAP_EXTRAS -DYAPOR_COPY=1"
;;
@ -1894,7 +1894,11 @@ fi
m4_include([packages/gecode/configure.in])
if test -e "$srcdir"/packages/raptor/Makefile.in; then
ENABLE_RAPTOR=""
m4_include([packages/raptor/configure.in])
else
ENABLE_RAPTOR="@# "
fi
m4_include([library/lammpi/configure.in])
@ -2098,4 +2102,3 @@ fi
AC_CONFIG_FILES([packages/yap-lbfgs/Makefile])
AC_OUTPUT()