Commit b5f63951 authored by Radford Neal's avatar Radford Neal

Merge branch '87-mods' into 88

parents 06b96a19 26339843
......@@ -6,3 +6,5 @@ Speed up to rbind.data.frame in simple cases. New version of codetools
that makes better use of this.
Bug fixes.
Tuning adjustments.
......@@ -1194,7 +1194,7 @@ void task_complex_arithmetic (helpers_op_t code, SEXP ans, SEXP s1, SEXP s2)
}
}
#define T_arithmetic THRESHOLD_ADJUST(24) /* >= 8, further adjusted below */
#define T_arithmetic THRESHOLD_ADJUST(500) /* >= 16, further adjusted below */
SEXP attribute_hidden R_binary (SEXP call, int opcode, SEXP x, SEXP y,
int objx, int objy, SEXP env, int variant)
......@@ -1432,9 +1432,9 @@ SEXP attribute_hidden R_binary (SEXP call, int opcode, SEXP x, SEXP y,
threshold = T_arithmetic;
if (TYPEOF(ans) == CPLXSXP)
threshold >>= 1;
threshold >>= 2;
if (opcode > TIMESOP)
threshold >>= 1;
threshold >>= 2;
SEXP xx = x, yy = y;
......@@ -1565,7 +1565,7 @@ void task_unary_minus (helpers_op_t op, SEXP ans, SEXP s1, SEXP ignored)
}
}
#define T_unary_minus THRESHOLD_ADJUST(20)
#define T_unary_minus THRESHOLD_ADJUST(500)
SEXP attribute_hidden R_unary (SEXP call, int opcode, SEXP s1, int obj1,
SEXP env, int variant)
......@@ -1818,7 +1818,7 @@ void task_sum_math1 (helpers_op_t opcode, SEXP sy, SEXP sa, SEXP ignored)
REAL(sy)[0] = (double) s;
}
#define T_math1 THRESHOLD_ADJUST(5)
#define T_math1 THRESHOLD_ADJUST(10)
static SEXP math1(SEXP sa, unsigned opcode, SEXP call, SEXP env, int variant)
/* Note: sa may be on the scalar stack. */
......@@ -2029,7 +2029,7 @@ void task_sum_abs (helpers_op_t op, SEXP s, SEXP x, SEXP ignored)
REAL(s)[0] = (double) r;
}
#define T_abs THRESHOLD_ADJUST(10)
#define T_abs THRESHOLD_ADJUST(500)
static SEXP do_fast_abs (SEXP call, SEXP op, SEXP x, SEXP env, int variant)
{
......
......@@ -447,7 +447,7 @@ void task_row_or_col (helpers_op_t op, SEXP ans, SEXP dim, SEXP ignored)
}
}
#define T_rowscols THRESHOLD_ADJUST(100)
#define T_rowscols THRESHOLD_ADJUST(500)
static SEXP do_rowscols (SEXP call, SEXP op, SEXP args, SEXP rho, int variant)
{
......@@ -740,7 +740,7 @@ void task_cmatprod_trans2 (helpers_op_t op, SEXP sz, SEXP sx, SEXP sy)
static SEXP do_transpose (SEXP, SEXP, SEXP, SEXP, int);
#define T_matmult THRESHOLD_ADJUST(30)
#define T_matmult THRESHOLD_ADJUST(300)
/* "%*%" (op = 0), crossprod (op = 1) or tcrossprod (op = 2). For op = 0,
it is set up as a SPECIAL so that it can evaluate its arguments requesting
......@@ -1321,7 +1321,7 @@ void task_transpose (helpers_op_t op, SEXP r, SEXP a, SEXP ignored)
/* This implements t.default, which is internal. Can be called from %*%
when VARIANT_TRANS result turns out to not be desired. */
#define T_transpose THRESHOLD_ADJUST(10)
#define T_transpose THRESHOLD_ADJUST(120)
static SEXP do_transpose (SEXP call, SEXP op, SEXP args, SEXP rho, int variant)
{
......@@ -1902,8 +1902,8 @@ void task_rowSums_or_rowMeans (helpers_op_t op, SEXP ans, SEXP x, SEXP ignored)
/* This implements (row/col)(Sums/Means). */
#define T_colSums THRESHOLD_ADJUST(20)
#define T_rowSums THRESHOLD_ADJUST(20)
#define T_colSums THRESHOLD_ADJUST(300)
#define T_rowSums THRESHOLD_ADJUST(300)
static SEXP do_colsum (SEXP call, SEXP op, SEXP args, SEXP rho, int variant)
{
......
......@@ -77,7 +77,7 @@ void task_copy_coerced (helpers_op_t code, SEXP out, SEXP in, SEXP in2)
names (if present) are to be used, and the variant (used to see if pending
computation is OK). */
#define T_c THRESHOLD_ADJUST(80)
#define T_c THRESHOLD_ADJUST(200)
static SEXP simple_concatenate (SEXP *objs, R_len_t nobj, int usenames,
int variant, SEXP call, SEXP env)
......
......@@ -3714,7 +3714,7 @@ void task_and_or (helpers_op_t code, SEXP ans, SEXP s1, SEXP s2)
/* Handles the & and | operators. */
#define T_and_or THRESHOLD_ADJUST(25)
#define T_and_or THRESHOLD_ADJUST(100)
SEXP attribute_hidden do_andor(SEXP call, SEXP op, SEXP args, SEXP env,
int variant)
......@@ -3919,7 +3919,7 @@ void task_not (helpers_op_t code, SEXP x, SEXP arg, SEXP unused)
/* Handles the ! operator. When unary, it's "not", when binary, it's paste0. */
#define T_not THRESHOLD_ADJUST(40)
#define T_not THRESHOLD_ADJUST(100)
static SEXP do_fast_not(SEXP call, SEXP op, SEXP arg, SEXP env, int variant)
{
......
......@@ -931,7 +931,7 @@ static SEXP string_relop_sum(RELOP_TYPE code, int F, SEXP s1, SEXP s2)
/* MAIN PART OF IMPLEMENTATION OF RELATIONAL OPERATORS. Called from
do_relop in eval.c, and from elsewhere. */
#define T_relop THRESHOLD_ADJUST(24)
#define T_relop THRESHOLD_ADJUST(60)
SEXP attribute_hidden R_relop (SEXP call, int opcode, SEXP x, SEXP y,
int objx, int objy, SEXP env, int variant)
......
......@@ -502,7 +502,7 @@ void task_rep (helpers_op_t op, SEXP a, SEXP s, SEXP t)
}
#define T_rep THRESHOLD_ADJUST(20)
#define T_rep THRESHOLD_ADJUST(300)
static SEXP do_rep_int(SEXP call, SEXP op, SEXP args, SEXP rho, int variant)
{
......
pqR version 2.15.1 (2016-00-00), based on R 2.15.0 (2012-03-30)
pqR version 2.15.1 (2018-00-00), based on R 2.15.0 (2012-03-30)
R 2.15.0 is Copyright (C) 2012 The R Foundation for Statistical Computing
ISBN 3-900051-07-0
Modifications to R in pqR are Copyright (C) 2013-2016 Radford M. Neal
Modifications to R in pqR are Copyright (C) 2013-2018 Radford M. Neal
Some modules are from R-2.15.1 or later versions distributed by the R Core Team
......@@ -23,7 +23,7 @@ Type 'demo()' for some demos, 'help()' for on-line help, or
Type 'q()' to quit R.
No helper threads, task merging enabled.
3 helper threads, task merging enabled, uncompressed pointers.
> pkgname <- "grDevices"
> source(file.path(R.home("share"), "R", "examples-header.R"))
......@@ -1745,8 +1745,6 @@ detaching 'package:grid'
> x <- rbind(x1,x2)
>
> dcols <- densCols(x)
KernSmooth 2.23 loaded
Copyright M. P. Wand 1997-2009
> graphics::plot(x, col = dcols, pch=20, main = "n = 1000")
>
>
......@@ -3524,7 +3522,7 @@ $zlab
> ### * <FOOTER>
> ###
> cat("Time elapsed: ", proc.time() - get("ptime", pos = 'CheckExEnv'),"\n")
Time elapsed: 1.208 0.02 1.231 0 0
Time elapsed: 0.947 0.021 0.664 0 0
> grDevices::dev.off()
null device
1
......
pqR version 2.15.1 (2016-00-00), based on R 2.15.0 (2012-03-30)
pqR version 2.15.1 (2018-00-00), based on R 2.15.0 (2012-03-30)
R 2.15.0 is Copyright (C) 2012 The R Foundation for Statistical Computing
ISBN 3-900051-07-0
Modifications to R in pqR are Copyright (C) 2013-2016 Radford M. Neal
Modifications to R in pqR are Copyright (C) 2013-2018 Radford M. Neal
Some modules are from R-2.15.1 or later versions distributed by the R Core Team
......@@ -23,7 +23,7 @@ Type 'demo()' for some demos, 'help()' for on-line help, or
Type 'q()' to quit R.
No helper threads, task merging enabled.
3 helper threads, task merging enabled, uncompressed pointers.
> pkgname <- "graphics"
> source(file.path(R.home("share"), "R", "examples-header.R"))
......@@ -2428,8 +2428,6 @@ Warning in matrix(0:1, ncol = 5, nrow = 3) :
>
> oldpar <- par(mfrow=c(2,2))
> smoothScatter(x, nrpoints=0)
KernSmooth 2.23 loaded
Copyright M. P. Wand 1997-2009
> smoothScatter(x)
>
> ## a different color scheme:
......@@ -3000,7 +2998,7 @@ function (xy = 1, warn.log = TRUE)
> ### * <FOOTER>
> ###
> cat("Time elapsed: ", proc.time() - get("ptime", pos = 'CheckExEnv'),"\n")
Time elapsed: 3.32 0.052 3.385 0 0
Time elapsed: 4.371 0.036 1.989 0 0
> grDevices::dev.off()
null device
1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment