don't export keras_version function

NAMESPACE

@@ -91,7 +91,6 @@ export(initializer_zeros)
 export(install_tensorflow)
 export(keras_model)
 export(keras_model_sequential)
-export(keras_version)
 export(layer_activation)
 export(layer_activation_elu)
 export(layer_activation_leaky_relu)

R/package.R

@@ -139,9 +139,7 @@ check_implementation_version <- function() {
 }
 
 
-#' Current version of Keras
-#' 
-#' @export
+# Current version of Keras
 keras_version <- function() {
   ver <- keras$`__version__`
   ver <- regmatches(ver, regexec("^([0-9\\.]+).*$", ver))[[1]][[2]]

tests/testthat/test-applications.R

@@ -13,7 +13,7 @@ test_succeeds("keras pre-built models can be instantiated", {
 
   if (is_backend("tensorflow")) {
     application_xception()
-    if (keras_version() >= "2.0.5")
+    if (have_keras("2.0.5"))
       application_mobilenet()
   }
   application_resnet50()

tests/testthat/test-metrics.R

@@ -27,6 +27,6 @@ test_succeeds("metrics be can called directly", {
   y_pred <- K$variable(matrix(c(0.3, 0.2, 0.1, 0.1, 0.2, 0.7), nrow=2, ncol = 3))
   y_true <- K$variable(matrix(c(0L, 1L), nrow = 2, ncol = 1))
   metric_top_k_categorical_accuracy(y_true, y_pred, k = 3)
-  if (keras_version() >= "2.0.5")
+  if (have_keras("2.0.5"))
     metric_sparse_top_k_categorical_accuracy(y_true, y_pred, k = 3)
 })

tests/testthat/utils.R

@@ -1,16 +1,19 @@
 
 skip_if_no_keras <- function(required_version = NULL) {
-  if (!have_keras())
-    skip("keras not available for testing")
-  else if (!is.null(required_version)) {
-    if (keras_version() < required_version)
-      skip("required version of keras not available for testing")
-  }
+  if (!have_keras(required_version))
+    skip("required keras version not available for testing")
 }
 
-have_keras <- function() {
+have_keras <- function(required_version = NULL) {
   implementation_module <- keras:::resolve_implementation_module()
-  reticulate::py_module_available(implementation_module)
+  if (reticulate::py_module_available(implementation_module)) {
+    if (!is.null(required_version))
+      keras:::keras_version() >= required_version
+    else
+      TRUE
+  } else {
+    FALSE
+  }
 }