Skip to content

Commit a86a603

Browse files
committed
fix node example
1 parent f93e778 commit a86a603

File tree

4 files changed

+25
-21
lines changed

4 files changed

+25
-21
lines changed

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: deepregression
22
Title: Fitting Deep Distributional Regression
3-
Version: 2.1.0
3+
Version: 2.2.0
44
Authors@R: c(
55
person("David", "Ruegamer", , "david.ruegamer@gmail.com", role = c("aut", "cre")),
66
person("Christopher", "Marquardt", , "ch.marquardt@campus.lmu.de", role = c("ctb")),

R/nodelayer.R

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,11 @@
2626
#' y = y_regr
2727
#' )
2828
#'
29+
#' if(!is.null(mod_node_regr)){
2930
#' mod_node_regr %>% fit(epochs = 15, batch_size = 64, verbose = TRUE,
3031
#' validation_split = 0.1, early_stopping = TRUE)
3132
#' mod_node_regr %>% predict()
33+
#' }
3234
#'
3335
layer_node <- function(name,
3436
units,

R/zzz.R

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,20 @@ create_package_name <- function(package, version)
1111
paste(package, version, sep="==")
1212

1313
.onLoad <- function(libname, pkgname) { # nocov start
14-
if(suppressMessages(!reticulate::py_available() | .Platform$OS.type == "windows"))
15-
{
16-
res <- suppressMessages(reticulate::configure_environment(pkgname))
17-
if(res & requireNamespace("tensorflow", quietly = TRUE) &
18-
requireNamespace("keras", quietly = TRUE)){
19-
suppressMessages(try(tf$compat$v1$logging$set_verbosity(
20-
tf$compat$v1$logging$ERROR)))
21-
suppressMessages(try(tf$get_logger()$setLevel('ERROR')))
22-
suppressMessages(try(tf$autograph$set_verbosity(level=0L)))
23-
suppressMessages(try(keras::use_implementation("tensorflow"), silent = TRUE))
24-
# catch TFP error
25-
suppressMessages(try(invisible(tfprobability::tfd_normal(0,1)), silent = TRUE))
26-
suppressMessages(try(invisible(tfprobability::tfd_normal(0,1)), silent = TRUE))
27-
}else{
14+
# if(suppressMessages(!reticulate::py_available() | .Platform$OS.type == "windows"))
15+
# {
16+
# res <- suppressMessages(reticulate::configure_environment(pkgname))
17+
# if(res & requireNamespace("tensorflow", quietly = TRUE) &
18+
# requireNamespace("keras", quietly = TRUE)){
19+
# suppressMessages(try(tf$compat$v1$logging$set_verbosity(
20+
# tf$compat$v1$logging$ERROR)))
21+
# suppressMessages(try(tf$get_logger()$setLevel('ERROR')))
22+
# suppressMessages(try(tf$autograph$set_verbosity(level=0L)))
23+
# suppressMessages(try(keras::use_implementation("tensorflow"), silent = TRUE))
24+
# # catch TFP error
25+
# suppressMessages(try(invisible(tfprobability::tfd_normal(0,1)), silent = TRUE))
26+
# suppressMessages(try(invisible(tfprobability::tfd_normal(0,1)), silent = TRUE))
27+
# }else{
2828
tf <<- reticulate::import("tensorflow", delay_load = list(
2929
on_load = function(){
3030
tape <<- tf$GradientTape
@@ -33,12 +33,12 @@ create_package_name <- function(package, version)
3333
)
3434
keras <<- reticulate::import("keras", delay_load = TRUE)
3535
tfp <<- reticulate::import("tensorflow_probability", delay_load = TRUE)
36-
}
37-
38-
}else{
39-
tf <- reticulate::import("tensorflow")
40-
tape <- tf$GradientTape
41-
} # nocov end
36+
# }
37+
#
38+
# }else{
39+
# tf <- reticulate::import("tensorflow")
40+
# tape <- tf$GradientTape
41+
# } # nocov end
4242
# options
4343
options(orthogonalize = TRUE,
4444
identify_intercept = FALSE,

man/layer_node.Rd

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)