From 1d9c430afacd5c9b3f4742e128717d9a0c92e291 Mon Sep 17 00:00:00 2001 From: Tomasz Kalinowski Date: Fri, 27 Sep 2019 11:17:41 -0400 Subject: [PATCH] tensorboard v2 compat; closes #359 --- R/tensorboard.R | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/R/tensorboard.R b/R/tensorboard.R index 55f8a7f8..20aefbf9 100644 --- a/R/tensorboard.R +++ b/R/tensorboard.R @@ -139,19 +139,31 @@ tensorboard <- function(log_dir, action = c("start", "stop"), } } + +tensorboard_version <- function() { + if (is.null(ver <- .globals$tensorboard_version)) { + ver <- package_version(system("tensorboard --version_tb", intern = TRUE)) + .globals$tensorboard_version <- ver + } + ver +} + + launch_tensorboard <- function(log_dir, host, port, explicit_port, reload_interval, purge_orphaned_data) { - # check for names and provide defaults - names <- names(log_dir) - if (is.null(names)) - names <- basename(log_dir) + if (tensorboard_version() < "2.0") { + # check for names and provide defaults + names <- names(log_dir) + if (is.null(names)) + names <- basename(log_dir) - # concatenate names if we have them - if (!is.null(names)) - log_dir <- paste0(names, ":", log_dir) + # concatenate names if we have them + if (!is.null(names)) + log_dir <- paste0(names, ":", log_dir) - # build log_dir - log_dir <- paste(log_dir, collapse = ",") + # build log_dir + log_dir <- paste(log_dir, collapse = ",") + } # start the process p <- processx::process$new("tensorboard",