Skip to content

Commit 7044e41

Browse files
authored
Merge pull request #360 from t-kalinowski/master
tensorboard v2 compat; closes #359
2 parents 5c7062f + 1d9c430 commit 7044e41

File tree

1 file changed

+21
-9
lines changed

1 file changed

+21
-9
lines changed

R/tensorboard.R

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -139,19 +139,31 @@ tensorboard <- function(log_dir, action = c("start", "stop"),
139139
}
140140
}
141141

142+
143+
tensorboard_version <- function() {
144+
if (is.null(ver <- .globals$tensorboard_version)) {
145+
ver <- package_version(system("tensorboard --version_tb", intern = TRUE))
146+
.globals$tensorboard_version <- ver
147+
}
148+
ver
149+
}
150+
151+
142152
launch_tensorboard <- function(log_dir, host, port, explicit_port, reload_interval, purge_orphaned_data) {
143153

144-
# check for names and provide defaults
145-
names <- names(log_dir)
146-
if (is.null(names))
147-
names <- basename(log_dir)
154+
if (tensorboard_version() < "2.0") {
155+
# check for names and provide defaults
156+
names <- names(log_dir)
157+
if (is.null(names))
158+
names <- basename(log_dir)
148159

149-
# concatenate names if we have them
150-
if (!is.null(names))
151-
log_dir <- paste0(names, ":", log_dir)
160+
# concatenate names if we have them
161+
if (!is.null(names))
162+
log_dir <- paste0(names, ":", log_dir)
152163

153-
# build log_dir
154-
log_dir <- paste(log_dir, collapse = ",")
164+
# build log_dir
165+
log_dir <- paste(log_dir, collapse = ",")
166+
}
155167

156168
# start the process
157169
p <- processx::process$new("tensorboard",

0 commit comments

Comments
 (0)