Skip to content

Commit

Permalink
fix check errors
Browse files Browse the repository at this point in the history
  • Loading branch information
mschubert committed Sep 10, 2023
1 parent d8f402f commit fedb138
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 8 deletions.
3 changes: 2 additions & 1 deletion .Rbuildignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
^doc$
^configure.backup$
^Meta$
^doc(s)?$
\.gitignore
Expand All @@ -13,11 +14,11 @@ clustermq_[0-9.]+\.tar\.gz
^\.github$
^src/libzmq/\.
^src/libzmq/config/.*\.m4$
^src/libzmq/build_qnx/.*Makefile$
^src/libzmq/builds/openwrt/Makefile$
^src/libzmq/Makefile$
^src/libzmq/CMakeFiles$
^src/libzmq/external/wepoll$
^src/libzmq/include/zmq_utils.h$
^src/libzmq/src/tweetnacl.c$
^src/cppzmq/\.
^windows$
1 change: 1 addition & 0 deletions R/worker.r
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
loadModule("cmq_worker", TRUE) # CMQWorker C++ class
utils::globalVariables(c("common_seed", "const", "fun")) # worker .GlobalEnv

#' R worker submitted as cluster job
#'
Expand Down
6 changes: 5 additions & 1 deletion configure
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ if [ ! -f src/libzmq/src/.libs/libzmq.a ]; then
mv src/curve_client_tools.hpp src/curve_client_tools.hpp.orig
sed '/^#pragma/s|^|//|' src/curve_client_tools.hpp.orig > src/curve_client_tools.hpp
fi
if [ ! -f include/zmq_utils.h.orig ]; then
mv include/zmq_utils.h src/zmq_utils.h.orig
sed '/^#pragma/s|^|//|' include/zmq_utils.h.orig > include/zmq_utils.h
fi

if [ ! -f Makefile.in ]; then
./autogen.sh || die
Expand All @@ -43,7 +47,7 @@ if [ ! -f src/libzmq/src/.libs/libzmq.a ]; then
--disable-curve-keygen \
--disable-ws \
--disable-radix-tree
make || die
make || exit 1
cd -
fi

Expand Down
2 changes: 1 addition & 1 deletion src/libzmq
Submodule libzmq updated 864 files
2 changes: 1 addition & 1 deletion vignettes/quickstart.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ Q(fx, x=list(iris), n_jobs=1)

`clustermq` can also be used as a parallel backend for
[`foreach`](https://cran.r-project.org/package=foreach). As this is also
used by [`BiocParallel`](http://bioconductor.org/packages/release/bioc/html/BiocParallel.html),
used by [`BiocParallel`](https://bioconductor.org/packages/release/bioc/html/BiocParallel.html),
we can run those packages on the cluster as well:

```{r}
Expand Down
6 changes: 3 additions & 3 deletions vignettes/technicaldocs.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ A pool of workers can be created using the `workers()` function, which
instantiates a `Pool` object of the corresponding `QSys`-derived scheduler
class. See `?workers` for details.

```r
```{r eval=FALSE}
# start up a pool of three workers using the default scheduler
w = workers(n_jobs=3)
Expand Down Expand Up @@ -101,7 +101,7 @@ After the expression (in `...`), any variables that should be passed along with
the call can be added. For batch processing that `clustermq` usually does, this
command is `work_chunk`, where the `chunk` data is added:

```{r}
```{r eval=FALSE}
w$send(clustermq:::work_chunk(chunk, fun, const, rettype, common_seed),
chunk = chunk(iter, submit_index))
```
Expand Down Expand Up @@ -173,7 +173,7 @@ names the proxy should add before forwarding to the worker.

A worker evaluates the call using the R C API:

```{r}
```{r eval=FALSE}
R_tryEvalSilent(cmd, env, &err);
```

Expand Down
2 changes: 1 addition & 1 deletion vignettes/userguide.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ clustermq::register_dopar_cmq(n_jobs=2, memory=1024) # this accepts same argumen
x = foreach(i=1:3) %dopar% sqrt(i) # this will be executed as jobs
```

As [BiocParallel](http://bioconductor.org/packages/release/bioc/html/BiocParallel.html)
As [BiocParallel](https://bioconductor.org/packages/release/bioc/html/BiocParallel.html)
supports `foreach` too, this means we can run all packages that use `BiocParallel`
on the cluster as well via `DoparParam`.

Expand Down

0 comments on commit fedb138

Please sign in to comment.