Skip to content

Commit 53a39d2

Browse files
committed
various small tweaks to installation documentation
1 parent 0ac04d1 commit 53a39d2

5 files changed

+35
-23
lines changed

R/install_greta_deps.R

+9-7
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,15 @@
44
#' these are TF 2.15.0, TFP 0.23.0, and Python 3.10. These Python modules
55
#' will be installed into a conda environment named "greta-env-tf2".
66
#'
7-
#' To see install notes or errors, there isn't an argument to specify,
7+
#' To see installation notes or errors, there isn't an argument to specify,
88
#' instead you will need to specify and environment variable,
99
#' `GRETA_INSTALLATION_LOG`, with
1010
#' `Sys.setenv('GRETA_INSTALLATION_LOG'='path/to/logfile.html')`. Or use
1111
#' [greta_set_install_logfile()] to set the path, e.g.,
1212
#' `greta_set_install_logfile('path/to/logfile.html')`. You can also skip
13-
#' the restarting of R and use [write_greta_install_log()], which
14-
#' installation notes will indicate how to use if you haven't specified.
13+
#' the restarting of R and use [write_greta_install_log()]. If you have
14+
#' not specified the `GRETA_INSTALLATION_LOG` environmental variable, the
15+
#' installation notes will indicate how to use [write_greta_install_log()].
1516
#'
1617
#' @param python_deps object created with [greta_python_deps()] where you
1718
#' specify python, TF, and TFP versions. By default these are TF 2.15.0,
@@ -42,10 +43,11 @@
4243
#' package versions, and forcibly switch over to using that conda environment.
4344
#'
4445
#' If you don't want to use conda or the "greta-env-tf2" conda environment, you
45-
#' can install these specific versions of tensorflow (version 2.6.0), and
46-
#' tensorflow-probability (version 0.14.1), and ensure that the python
47-
#' environment that is initialised in this R session has these versions
48-
#' installed. This is now always straightforward, so we recommend installing
46+
#' can install versions that you like, e.g., using [reticulate::py_install()].
47+
#' If you want to see which versions of TF, TFP, and Python work with each
48+
#' other (at least according to information from tensorflows website), see the
49+
#' data `greta_deps_tf_tfp`, which is provided with greta. Managing your own
50+
#' installation is not always straightforward, so we recommend installing
4951
#' the python packages using `install_greta_deps()` for most users.
5052
#'
5153
#' @name install_greta_deps

R/reinstallers.R

+7-4
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,17 @@
33
#' This can be useful when debugging greta installation to get to "clean slate".
44
#' There are four functions:
55
#'
6-
#' - `remove_greta_env()` removes the 'greta-env-tf2' conda environment
7-
#' - `remove_miniconda()` removes miniconda installation
8-
#' - `reinstall_greta_env()` remove 'greta-env-tf2' and reinstall it using `greta_create_conda_env()` (which is used internally).
9-
#' - `reinstall_miniconda()` removes miniconda and reinstalls it using `greta_install_miniconda()` (which is used internally)
6+
#' - [remove_greta_env()] removes the 'greta-env-tf2' conda environment
7+
#' - [remove_miniconda()] removes miniconda installation
8+
#' - [reinstall_greta_env()] remove 'greta-env-tf2' and reinstall it
9+
#' using [greta_create_conda_env()] (which is used internally).
10+
#' - [reinstall_miniconda()] removes miniconda and reinstalls it using
11+
#' [greta_install_miniconda()] (which is used internally)
1012
#'
1113
#' @return invisible
1214
#' @export
1315
#' @name reinstallers
16+
#' @seealso [destroy_greta_deps()]
1417
#'
1518
#' @examples
1619
#' \dontrun{

R/write-logfiles.R

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#' Set logfile path when installing greta
22
#'
33
#' To help debug greta installation, you can save all installation output
4-
#' to a single logfile.
4+
#' to a single logfile.
55
#'
66
#' @param path valid path to logfile - should end with `.html` so you
77
#' can benefit from the html rendering.

man/install_greta_deps.Rd

+9-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/reinstallers.Rd

+9-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)