Skip to content

Commit 4d41ff3

Browse files
committed
R-3.6 compat
1 parent bae5815 commit 4d41ff3

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

R/generics.R

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ Conj.keras.engine.keras_tensor.KerasTensor <- get("Conj.tensorflow.tensor", envi
7474
#' @export
7575
cos.keras.engine.keras_tensor.KerasTensor <- get("cos.tensorflow.tensor", envir = asNamespace("tensorflow"))
7676

77+
#' @method cospi keras.engine.keras_tensor.KerasTensor
7778
#' @export
7879
cospi.keras.engine.keras_tensor.KerasTensor <- get("cospi.tensorflow.tensor", envir = asNamespace("tensorflow"))
7980

@@ -133,6 +134,7 @@ sign.keras.engine.keras_tensor.KerasTensor <- get("sign.tensorflow.tensor", envi
133134
#' @export
134135
sin.keras.engine.keras_tensor.KerasTensor <- get("sin.tensorflow.tensor", envir = asNamespace("tensorflow"))
135136

137+
#' @method sinpi keras.engine.keras_tensor.KerasTensor
136138
#' @export
137139
sinpi.keras.engine.keras_tensor.KerasTensor <- get("sinpi.tensorflow.tensor", envir = asNamespace("tensorflow"))
138140

@@ -143,6 +145,7 @@ sqrt.keras.engine.keras_tensor.KerasTensor <- get("sqrt.tensorflow.tensor", envi
143145
tan.keras.engine.keras_tensor.KerasTensor <- get("tan.tensorflow.tensor", envir = asNamespace("tensorflow"))
144146

145147
#' @export
148+
#' @method tanpi keras.engine.keras_tensor.KerasTensor
146149
tanpi.keras.engine.keras_tensor.KerasTensor <- get("tanpi.tensorflow.tensor", envir = asNamespace("tensorflow"))
147150

148151

R/py-classes.R

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,7 @@ r_formals_to_py__signature__ <- function(fn) {
318318
public <- active <- list()
319319
for(nm in names(env)) {
320320
if(bindingIsActive(nm, env)) {
321+
# requires R >= 4.0
321322
active[[nm]] <- activeBindingFunction(nm, env)
322323
} else
323324
public[[nm]] <- env[[nm]]
@@ -340,3 +341,8 @@ r_formals_to_py__signature__ <- function(fn) {
340341
assign(classname, py_cls, envir = parent_env)
341342
invisible(py_cls)
342343
}
344+
345+
if (getRversion() < "4.0")
346+
activeBindingFunction <- function(nm, env) {
347+
as.list.environment(env, all.names = TRUE)[[nm]]
348+
}

0 commit comments

Comments
 (0)