From 183afc5b45f96b56d2df6d40effcacf9fcab2967 Mon Sep 17 00:00:00 2001 From: turgut090 Date: Mon, 4 Sep 2023 16:35:29 +0400 Subject: [PATCH 01/24] update yaml --- .github/workflows/tfaddons_github.yml | 64 --------------------------- .github/workflows/tfaddons_stable.yml | 12 ++--- 2 files changed, 3 insertions(+), 73 deletions(-) delete mode 100644 .github/workflows/tfaddons_github.yml diff --git a/.github/workflows/tfaddons_github.yml b/.github/workflows/tfaddons_github.yml deleted file mode 100644 index bef8829..0000000 --- a/.github/workflows/tfaddons_github.yml +++ /dev/null @@ -1,64 +0,0 @@ -on: [pull_request] - -name: TFA - -jobs: - R-CMD: - runs-on: ${{ matrix.config.os }} - - name: ${{ matrix.config.os }} (TF ${{ matrix.config.tf }}) (from Github) - - strategy: - fail-fast: false - matrix: - config: - - { os: windows-latest, tf: '2.0.0', tensorflow-addons: 'git+git://github.com/tensorflow/addons@master'} - - { os: macOS-latest, tf: '2.0.0', tensorflow-addons: 'git+git://github.com/tensorflow/addons@master'} - - { os: ubuntu-16.04, cran: "https://demo.rstudiopm.com/all/__linux__/xenial/latest", tf: '2.0.0', tensorflow-addons: 'git+git://github.com/tensorflow/addons@master'} - - { os: windows-latest, tf: '2.1.0', tensorflow-addons: 'git+git://github.com/tensorflow/addons@master'} - - { os: macOS-latest, tf: '2.1.0', tensorflow-addons: 'git+git://github.com/tensorflow/addons@master'} - - { os: ubuntu-16.04, cran: "https://demo.rstudiopm.com/all/__linux__/xenial/latest", tf: '2.1.0', tensorflow-addons: 'git+git://github.com/tensorflow/addons@master'} - - { os: windows-latest, tf: '2.2.0', tensorflow-addons: 'git+git://github.com/tensorflow/addons@master'} - - { os: macOS-latest, tf: '2.2.0', tensorflow-addons: 'git+git://github.com/tensorflow/addons@master'} - - { os: ubuntu-16.04, cran: "https://demo.rstudiopm.com/all/__linux__/xenial/latest", tf: '2.2.0', tensorflow-addons: 'git+git://github.com/tensorflow/addons@master'} - - { os: windows-latest, tf: '2.3.0', tensorflow-addons: 'git+git://github.com/tensorflow/addons@master'} - - { os: macOS-latest, tf: '2.3.0', tensorflow-addons: 'git+git://github.com/tensorflow/addons@master'} - - { os: ubuntu-16.04, cran: "https://demo.rstudiopm.com/all/__linux__/xenial/latest", tf: '2.3.0', tensorflow-addons: 'git+git://github.com/tensorflow/addons@master'} - - env: - R_REMOTES_NO_ERRORS_FROM_WARNINGS: true - TF_VERSION: ${{ matrix.config.tf }} - TENSORFLOW_ADDONS_VERSION: ${{ matrix.config.tensorflow-addons }} - PIP_NO_WARN_SCRIPT_LOCATION: false - RETICULATE_AUTOCONFIGURE: 'FALSE' - CRAN: ${{ matrix.config.cran }} - - steps: - - uses: actions/checkout@v1 - - - uses: r-lib/actions/setup-r@master - - - uses: r-lib/actions/setup-pandoc@master - - - name: Install deps - run: | - Rscript -e "install.packages('remotes')" - Rscript -e "remotes::install_deps(dependencies = TRUE)" - Rscript -e "remotes::install_cran('rcmdcheck')" - - - name: Install Python - run: | - Rscript -e "install.packages('reticulate')" - Rscript -e "try(reticulate::install_miniconda())" - Rscript -e "reticulate::conda_create('r-reticulate', packages = 'python==3.6.10')" - - name: Install TensorFlow - run: | - Rscript -e "remotes::install_local()" - Rscript -e "tensorflow::install_tensorflow(version = Sys.getenv('TF_VERSION'))" - Rscript -e "reticulate::py_install(c('setuptools', 'wheel', 'requests', 'tqdm'), pip = TRUE)" - - name: Check - continue-on-error: ${{ matrix.config.allow_failure }} - - - - run: Rscript -e "rcmdcheck::rcmdcheck(args = '--no-manual', error_on = 'warning', check_dir = 'check')" diff --git a/.github/workflows/tfaddons_stable.yml b/.github/workflows/tfaddons_stable.yml index f82e0ef..8058b0c 100644 --- a/.github/workflows/tfaddons_stable.yml +++ b/.github/workflows/tfaddons_stable.yml @@ -12,15 +12,9 @@ jobs: fail-fast: false matrix: config: - - { os: windows-latest, tf: '2.0.0', tensorflow-addons: '0.10.0'} - - { os: macOS-latest, tf: '2.0.0', tensorflow-addons: '0.10.0'} - - { os: ubuntu-16.04, cran: "https://demo.rstudiopm.com/all/__linux__/xenial/latest", tf: '2.0.0', tensorflow-addons: '0.10.0'} - - { os: windows-latest, tf: '2.1.0', tensorflow-addons: '0.10.0'} - - { os: macOS-latest, tf: '2.1.0', tensorflow-addons: '0.10.0'} - - { os: ubuntu-16.04, cran: "https://demo.rstudiopm.com/all/__linux__/xenial/latest", tf: '2.1.0', tensorflow-addons: '0.10.0'} - - { os: windows-latest, tf: '2.2.0', tensorflow-addons: '0.10.0'} - - { os: macOS-latest, tf: '2.2.0', tensorflow-addons: '0.10.0'} - - { os: ubuntu-16.04, cran: "https://demo.rstudiopm.com/all/__linux__/xenial/latest", tf: '2.2.0', tensorflow-addons: '0.10.0'} + - { os: windows-latest, tf: '2.13.0', tensorflow-addons: '0.21.0'} + - { os: macOS-latest, tf: '2.13.0', tensorflow-addons: '0.21.0'} + - { os: ubuntu-latest, cran: "https://demo.rstudiopm.com/all/__linux__/xenial/latest", tf: '2.13.0', tensorflow-addons: '0.21.0'} env: R_REMOTES_NO_ERRORS_FROM_WARNINGS: true From 5d673f0480406983782c4a31fea3bdbecb9ae23e Mon Sep 17 00:00:00 2001 From: turgut090 Date: Mon, 4 Sep 2023 16:35:42 +0400 Subject: [PATCH 02/24] install latest tfaddons and see tests --- R/install.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/install.R b/R/install.R index f811e04..5220583 100644 --- a/R/install.R +++ b/R/install.R @@ -17,7 +17,7 @@ install_tfaddons <- function(version = NULL, ..., restart_session = TRUE) { } if (is.null(version)) - module_string <- paste0("tensorflow-addons==", '0.16.1') + module_string <- paste0("tensorflow-addons==", '0.21.0') else module_string <- paste0("tensorflow-addons==", version) From 95bc357b2e803f740fcae9c016a847be4cd3f3ab Mon Sep 17 00:00:00 2001 From: turgut090 Date: Mon, 4 Sep 2023 16:36:27 +0400 Subject: [PATCH 03/24] fix yaml --- .github/workflows/tfaddons_stable.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tfaddons_stable.yml b/.github/workflows/tfaddons_stable.yml index 8058b0c..4e2a065 100644 --- a/.github/workflows/tfaddons_stable.yml +++ b/.github/workflows/tfaddons_stable.yml @@ -25,12 +25,12 @@ jobs: CRAN: ${{ matrix.config.cran }} steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - - uses: r-lib/actions/setup-r@master + - uses: r-lib/actions/setup-r@v2 with: r-version: '4.1.0' - - uses: r-lib/actions/setup-pandoc@master + - uses: r-lib/actions/setup-pandoc@v2 - name: Install deps run: | From 8f479de79aaa2c66248486cbd356e4cc0e7580c7 Mon Sep 17 00:00:00 2001 From: turgut090 Date: Mon, 4 Sep 2023 17:02:52 +0400 Subject: [PATCH 04/24] bump version --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index babf8a2..34934dc 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: tfaddons Type: Package Title: Interface to 'TensorFlow SIG Addons' -Version: 0.10.3 +Version: 0.10.4 Authors@R: c( person("Turgut", "Abdullayev", role = c("aut", "cre"), email = "turqut.a.314@gmail.com") From 74bbdcf654ac4d45efd31f5a77eb1ee4b81ff215 Mon Sep 17 00:00:00 2001 From: turgut090 Date: Mon, 4 Sep 2023 17:03:00 +0400 Subject: [PATCH 05/24] update readme --- README.md | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 56d0d07..7e66b8e 100644 --- a/README.md +++ b/README.md @@ -6,14 +6,10 @@ The `tfaddons` package provides R wrappers to [TensorFlow Addons](https://www.te __TensorFlow Addons__ is a repository of contributions that conform to well-established API patterns, but implement new functionality not available in core TensorFlow. TensorFlow natively supports a large number of operators, layers, metrics, losses, and optimizers. However, in a fast moving field like ML, there are many interesting new developments that cannot be integrated into core TensorFlow (because their broad applicability is not yet clear, or it is mostly used by a smaller subset of the community). -[![Actions Status](https://github.com/henry090/tfaddons/workflows/TFA_stable/badge.svg)](https://github.com/henry090/tfaddons) -[![Actions Status](https://github.com/henry090/tfaddons/workflows/TFA/badge.svg)](https://github.com/henry090/tfaddons) +[![Actions Status](https://github.com/eagerai/tfaddons/workflows/TFA_stable/badge.svg)](https://github.com/eagerai/tfaddons) [![CRAN](https://www.r-pkg.org/badges/version/tfaddons?color=darkgreen)](https://cran.r-project.org/package=tfaddons) -[![Lifecycle: experimental](https://img.shields.io/badge/lifecycle-experimental-orange.svg)](https://www.tidyverse.org/lifecycle/#experimental) [![Last month downloads](http://cranlogs.r-pkg.org/badges/last-month/tfaddons?color=green)](https://cran.r-project.org/package=tfaddons) -[![Last commit](https://img.shields.io/github/last-commit/henry090/tfaddons.svg)](https://github.com/henry090/tfaddons/commits/master) - -![](https://img.shields.io/docker/cloud/build/turqut314/tfaddons?style=plastic) +[![Last commit](https://img.shields.io/github/last-commit/eagerai/tfaddons.svg)](https://github.com/eagerai/tfaddons/commits/master) TF-addons @@ -39,7 +35,7 @@ Requirements: The dev version: ``` -devtools::install_github('henry090/tfaddons') +devtools::install_github('eagerai/tfaddons') ``` Later, you need to install the python module *tensorflow-addons*: From 2d7789e38cff8b016cd31387788a4f4e88011dd5 Mon Sep 17 00:00:00 2001 From: turgut090 Date: Mon, 4 Sep 2023 17:03:15 +0400 Subject: [PATCH 06/24] update to python 3.8 --- .github/workflows/tfaddons_stable.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tfaddons_stable.yml b/.github/workflows/tfaddons_stable.yml index 4e2a065..45ef178 100644 --- a/.github/workflows/tfaddons_stable.yml +++ b/.github/workflows/tfaddons_stable.yml @@ -32,6 +32,14 @@ jobs: r-version: '4.1.0' - uses: r-lib/actions/setup-pandoc@v2 + - name: Install dependencies Linux + if: runner.os == 'Linux' + run: | + sudo apt-get install libcurl4-openssl-dev + sudo add-apt-repository -y ppa:cran/imagemagick + sudo apt-get update + sudo apt-get install -y libmagick++-dev + - name: Install deps run: | Rscript -e "install.packages('remotes')" @@ -42,7 +50,7 @@ jobs: run: | Rscript -e "install.packages('reticulate')" Rscript -e "try(reticulate::install_miniconda())" - Rscript -e "reticulate::conda_create('r-reticulate', packages = 'python==3.6.10')" + Rscript -e "reticulate::conda_create('r-reticulate', packages = 'python==3.8')" - name: Install TensorFlow run: | Rscript -e "remotes::install_local()" From 40300e1f94508870af4045cfa3e5c56def6f1976 Mon Sep 17 00:00:00 2001 From: turgut090 Date: Mon, 4 Sep 2023 17:20:20 +0400 Subject: [PATCH 07/24] update yaml --- .github/workflows/tfaddons_stable.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tfaddons_stable.yml b/.github/workflows/tfaddons_stable.yml index 45ef178..d9fbb50 100644 --- a/.github/workflows/tfaddons_stable.yml +++ b/.github/workflows/tfaddons_stable.yml @@ -35,10 +35,8 @@ jobs: - name: Install dependencies Linux if: runner.os == 'Linux' run: | - sudo apt-get install libcurl4-openssl-dev - sudo add-apt-repository -y ppa:cran/imagemagick - sudo apt-get update - sudo apt-get install -y libmagick++-dev + sudo apt-get update && sudo apt + sudo apt-get install curl - name: Install deps run: | From 457262b1fd986d60c38f4bc730f48a3ae8a1907a Mon Sep 17 00:00:00 2001 From: turgut090 Date: Mon, 4 Sep 2023 17:20:59 +0400 Subject: [PATCH 08/24] update --- .github/workflows/tfaddons_stable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tfaddons_stable.yml b/.github/workflows/tfaddons_stable.yml index d9fbb50..e994086 100644 --- a/.github/workflows/tfaddons_stable.yml +++ b/.github/workflows/tfaddons_stable.yml @@ -35,7 +35,7 @@ jobs: - name: Install dependencies Linux if: runner.os == 'Linux' run: | - sudo apt-get update && sudo apt + sudo apt-get update && sudo apt-get upgrade sudo apt-get install curl - name: Install deps From 1229d59873681b88cf56b2c99e25fe8288045662 Mon Sep 17 00:00:00 2001 From: turgut090 Date: Tue, 5 Sep 2023 10:47:14 +0400 Subject: [PATCH 09/24] py to 3.10 --- .github/workflows/tfaddons_stable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tfaddons_stable.yml b/.github/workflows/tfaddons_stable.yml index e994086..0845d5b 100644 --- a/.github/workflows/tfaddons_stable.yml +++ b/.github/workflows/tfaddons_stable.yml @@ -48,7 +48,7 @@ jobs: run: | Rscript -e "install.packages('reticulate')" Rscript -e "try(reticulate::install_miniconda())" - Rscript -e "reticulate::conda_create('r-reticulate', packages = 'python==3.8')" + Rscript -e "reticulate::conda_create('r-reticulate', packages = 'python==3.10')" - name: Install TensorFlow run: | Rscript -e "remotes::install_local()" From e45402b903755eab0f04959d10f06cf41b2c7e02 Mon Sep 17 00:00:00 2001 From: turgut090 Date: Tue, 5 Sep 2023 10:47:29 +0400 Subject: [PATCH 10/24] fix img equalize --- R/image_ops.R | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/R/image_ops.R b/R/image_ops.R index 0027d1a..7f5a057 100644 --- a/R/image_ops.R +++ b/R/image_ops.R @@ -234,36 +234,21 @@ img_dense_image_warp <- function(image, #' @description Equalize image(s) #' #' -#' @param image A tensor of shape (num_images, num_rows, num_columns, num_channels) (NHWC), -#' or (num_images, num_channels, num_rows, num_columns) (NCHW), or -#' (num_rows, num_columns, num_channels) (HWC), or (num_channels, num_rows, num_columns) (CHW), -#' or (num_rows, num_columns) (HW). The rank must be statically known (the shape is -#' not TensorShape(None)). -#' @param data_format Either 'channels_first' or 'channels_last' -#' @param name The name of the op. Returns: Image(s) with the same type and -#' shape as `images`, equalized. -#' -#' @examples -#' -#' \dontrun{ -#' img_equalize(img) -#' } +#' @param image image +#' @param bins The number of bins in the histogram. +#' @param name The name of the op. Returns: Image(s) with the same type and shape as `images`, equalized. #' #' @return Image(s) with the same type and shape as `images`, equalized. #' #' @export -img_equalize <- function(image, - data_format = "channels_last", - name = NULL) { +img_equalize <- function(image, bins = 256, name = NULL) { - args <- list( + tfa$image$equalize( image = image, - data_format = data_format, + bins = as.integer(bins), name = name ) - do.call(tfa$image$equalize, args) - } From b0565c48fe6ccf65aeb19a3ce4dbaeae3f97eb1b Mon Sep 17 00:00:00 2001 From: turgut090 Date: Tue, 5 Sep 2023 10:47:39 +0400 Subject: [PATCH 11/24] total steps as int --- R/optimizers.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/optimizers.R b/R/optimizers.R index fb53c86..541bff1 100644 --- a/R/optimizers.R +++ b/R/optimizers.R @@ -276,7 +276,7 @@ optimizer_radam <- function(learning_rate = 0.001, # float for total_steps is here to be able to load models created before # https://github.com/tensorflow/addons/pull/1375 was merged. It should be # removed for Addons 0.11. - total_steps = total_steps, + total_steps = as.integer(total_steps), warmup_proportion = warmup_proportion, min_lr = min_lr, name = name, From 402abdcf9036d7702ddb49e94406a1308c10a521 Mon Sep 17 00:00:00 2001 From: turgut090 Date: Tue, 5 Sep 2023 10:48:10 +0400 Subject: [PATCH 12/24] fix runif --- tests/testthat/test-callbacks.R | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/testthat/test-callbacks.R b/tests/testthat/test-callbacks.R index a8d52b2..8cf735a 100644 --- a/tests/testthat/test-callbacks.R +++ b/tests/testthat/test-callbacks.R @@ -4,10 +4,10 @@ source("utils.R") test_succeeds("data is generated", { - x_data <- matrix(data = runif(500,0,1),nrow = 50,ncol = 5) + x_data <- matrix(data = runif(250,0,1),nrow = 50,ncol = 5) y_data <- ifelse(runif(50,0,1) > 0.6, 1L,0L) %>% as.matrix() - x_data2 <- matrix(data = runif(500,0,1),nrow = 50,ncol = 5) + x_data2 <- matrix(data = runif(250,0,1),nrow = 50,ncol = 5) y_data2 <- ifelse(runif(50,0,1) > 0.6, 1L,0L) %>% as.matrix() }) @@ -21,7 +21,7 @@ test_succeeds("callback_time_stopping", { epochs = 1, verbose=0, validation_data = list(x_data2,y_data2), - callbacks = list(tfaddons::callback_time_stopping(seconds = 1) + callbacks = list(tfaddons::callback_time_stopping(seconds = 10) )) }) From 97be40634a755d9c43d850e5471ca615c6f9b0ba Mon Sep 17 00:00:00 2001 From: turgut090 Date: Thu, 7 Sep 2023 10:27:52 +0400 Subject: [PATCH 13/24] update roxygen --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 34934dc..2330547 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -21,7 +21,7 @@ BugReports: https://github.com/henry090/tfaddons/issues SystemRequirements: TensorFlow >= 2.0 (https://www.tensorflow.org/) Encoding: UTF-8 LazyData: true -RoxygenNote: 7.1.2 +RoxygenNote: 7.2.3 Imports: reticulate, tensorflow, From de72aecffa001a96c9b02aba0653c74b3da92d86 Mon Sep 17 00:00:00 2001 From: turgut090 Date: Thu, 7 Sep 2023 10:28:01 +0400 Subject: [PATCH 14/24] update optimizers --- R/optimizers.R | 29 ++++++++------------ R/optimizers_.R | 70 ++++++++++++++----------------------------------- 2 files changed, 31 insertions(+), 68 deletions(-) diff --git a/R/optimizers.R b/R/optimizers.R index 541bff1..b74f17e 100644 --- a/R/optimizers.R +++ b/R/optimizers.R @@ -57,34 +57,27 @@ attr(optimizer_lazy_adam, "py_function_name") <- "lazy_adam" #' @param learning_rate A Tensor or a floating point value, or a schedule that is a tf$keras$optimizers$schedules$LearningRateSchedule The learning rate. #' @param lambda_ A Tensor or a floating point value. The constraint. #' @param epsilon A Tensor or a floating point value. A small constant for numerical stability when handling the case of norm of gradient to be zero. -#' @param use_locking If True, use locks for update operations. #' @param name Optional name prefix for the operations created when applying gradients. Defaults to 'ConditionalGradient'. -#' @param clipnorm is clip gradients by norm. -#' @param clipvalue is clip gradients by value. -#' @param decay is included for backward compatibility to allow time inverse decay of learning rate. -#' @param lr is included for backward compatibility, recommended to use learning_rate instead. +#' @param ... keyword arguments. Allowed to be {clipnorm, clipvalue, lr, decay}. clipnorm is clip gradients by norm; clipvalue is clip gradients by value, decay is included for backward compatibility to allow time inverse decay of learning rate. lr is included for backward compatibility, recommended to use learning_rate instead. #' @return Optimizer for use with `keras::compile()` #' @export -optimizer_conditional_gradient <- function(learning_rate, lambda_, epsilon = 1e-07, use_locking = FALSE, - name = 'ConditionalGradient', - clipnorm = NULL, clipvalue = NULL, - decay = NULL, lr = NULL) { +optimizer_conditional_gradient <- function( + learning_rate, + lambda_ = 0.01, + epsilon = 1e-07, + ord = 'fro', + name = 'ConditionalGradient', + ...) { args <- list( learning_rate = learning_rate, lambda_ = lambda_, epsilon = epsilon, - use_locking = use_locking, + ord = ord, name = name, - clipnorm = clipnorm, - clipvalue = clipvalue, - decay = decay, - lr = lr + ... ) - args$clipnorm <- clipnorm - args$clipvalue <- clipvalue - args$decay <- decay - args$lr <- lr + do.call(tfa$optimizers$ConditionalGradient, args) } diff --git a/R/optimizers_.R b/R/optimizers_.R index 3998e34..edd1d11 100644 --- a/R/optimizers_.R +++ b/R/optimizers_.R @@ -71,20 +71,14 @@ lookahead_mechanism <- function(optimizer, #' #' @param optimizer str or tf$keras$optimizers$Optimizer that will be used to compute #' and apply gradients. -#' @param sequential_update Bool. If False, will compute the moving average at the same -#' time as the model is updated, potentially doing benign data races. If True, will update -#' the moving average after gradient updates. #' @param average_decay float. Decay to use to maintain the moving averages of trained variables. #' @param num_updates Optional count of the number of updates applied to variables. #' @param name Optional name for the operations created when applying gradients. #' Defaults to "MovingAverage". #' -#' @param clipnorm is clip gradients by norm. -#' @param clipvalue is clip gradients by value. -#' @param decay is included for backward compatibility to allow time inverse decay of learning rate. -#' @param lr is included for backward compatibility, recommended to use learning_rate instead. -#' -#' +#' @param dynamic_decay bool. Whether to change the decay based on the number of optimizer updates. Decay will start at 0.1 and gradually increase up to average_decay after each optimizer update. +#' @param start_step int. What step to start the moving average. +#' @param ... keyword arguments. Allowed to be {clipnorm, clipvalue, lr, decay}. clipnorm is clip gradients by norm; clipvalue is clip gradients by value, decay is included for backward compatibility to allow time inverse decay of learning rate. lr is included for backward compatibility, recommended to use learning_rate instead. #' @examples #' #' \dontrun{ @@ -97,31 +91,29 @@ lookahead_mechanism <- function(optimizer, #' @return Optimizer for use with `keras::compile()` #' @export optimizer_moving_average <- function(optimizer, - sequential_update = TRUE, - average_decay = 0.99, - num_updates = NULL, - name = 'MovingAverage', - clipnorm = NULL, clipvalue = NULL, - decay = NULL, lr = NULL) { + average_decay = 0.99, + num_updates = NULL, + start_step = 0, + dynamic_decay = FALSE, + name = 'MovingAverage', + ...) { args = list( optimizer = optimizer, - sequential_update = sequential_update, average_decay = average_decay, num_updates = num_updates, + start_step = as.integer(start_step), + dynamic_decay = dynamic_decay, name = name, - - clipnorm = clipnorm, - clipvalue = clipvalue, - decay = decay, - lr = lr + ... ) - args$clipnorm <- clipnorm - args$clipvalue <- clipvalue - args$decay <- decay - args$lr <- lr + if(is.null(num_updates)) { + args$num_updates <- NULL + } else { + args$num_updates <- as.integer(args$num_updates) + } do.call(tfa$optimizers$MovingAverage, args) @@ -152,16 +144,7 @@ optimizer_moving_average <- function(optimizer, #' @param average_period An integer. The synchronization period of SWA. The averaging occurs every #' average_period steps. Averaging period needs to be >= 1. #' @param name Optional name for the operations created when applying gradients. Defaults to 'SWA'. -#' @param sequential_update Bool. If FALSE, will compute the moving average at the same time as the -#' model is updated, potentially doing benign data races. If True, will update the moving average -#' after gradient updates -#' -#' -#' @param clipnorm is clip gradients by norm. -#' @param clipvalue is clip gradients by value. -#' @param decay is included for backward compatibility to allow time inverse decay of learning rate. -#' @param lr is included for backward compatibility, recommended to use learning_rate instead. -#' +#' @param ... keyword arguments. Allowed to be {clipnorm, clipvalue, lr, decay}. clipnorm is clip gradients by norm; clipvalue is clip gradients by value, decay is included for backward compatibility to allow time inverse decay of learning rate. lr is included for backward compatibility, recommended to use learning_rate instead. #' #' @examples #' @@ -176,29 +159,16 @@ optimizer_swa <- function(optimizer, start_averaging = 0, average_period = 10, name = 'SWA', - sequential_update=TRUE, - clipnorm = NULL, clipvalue = NULL, - decay = NULL, lr = NULL) { + ...) { args = list( optimizer = optimizer, start_averaging = as.integer(start_averaging), average_period = as.integer(average_period), name = name, - sequential_update = sequential_update, - - clipnorm = clipnorm, - clipvalue = clipvalue, - decay = decay, - lr = lr - + ... ) - args$clipnorm <- clipnorm - args$clipvalue <- clipvalue - args$decay <- decay - args$lr <- lr - do.call(tfa$optimizers$SWA, args) } From 6f41b87290fc9f60f9091976dd5daf6ab162ab0d Mon Sep 17 00:00:00 2001 From: turgut090 Date: Thu, 7 Sep 2023 10:28:15 +0400 Subject: [PATCH 15/24] fix docs as well --- man/img_equalize.Rd | 20 ++++---------------- man/optimizer_conditional_gradient.Rd | 19 ++++--------------- man/optimizer_moving_average.Rd | 24 ++++++++---------------- man/optimizer_swa.Rd | 18 ++---------------- 4 files changed, 18 insertions(+), 63 deletions(-) diff --git a/man/img_equalize.Rd b/man/img_equalize.Rd index 8137f3c..b49a1a4 100644 --- a/man/img_equalize.Rd +++ b/man/img_equalize.Rd @@ -4,19 +4,14 @@ \alias{img_equalize} \title{Equalize} \usage{ -img_equalize(image, data_format = "channels_last", name = NULL) +img_equalize(image, bins = 256, name = NULL) } \arguments{ -\item{image}{A tensor of shape (num_images, num_rows, num_columns, num_channels) (NHWC), -or (num_images, num_channels, num_rows, num_columns) (NCHW), or -(num_rows, num_columns, num_channels) (HWC), or (num_channels, num_rows, num_columns) (CHW), -or (num_rows, num_columns) (HW). The rank must be statically known (the shape is -not TensorShape(None)).} +\item{image}{image} -\item{data_format}{Either 'channels_first' or 'channels_last'} +\item{bins}{The number of bins in the histogram.} -\item{name}{The name of the op. Returns: Image(s) with the same type and -shape as `images`, equalized.} +\item{name}{The name of the op. Returns: Image(s) with the same type and shape as `images`, equalized.} } \value{ Image(s) with the same type and shape as `images`, equalized. @@ -24,10 +19,3 @@ Image(s) with the same type and shape as `images`, equalized. \description{ Equalize image(s) } -\examples{ - -\dontrun{ -img_equalize(img) -} - -} diff --git a/man/optimizer_conditional_gradient.Rd b/man/optimizer_conditional_gradient.Rd index 3d88109..e3d53c4 100644 --- a/man/optimizer_conditional_gradient.Rd +++ b/man/optimizer_conditional_gradient.Rd @@ -6,14 +6,11 @@ \usage{ optimizer_conditional_gradient( learning_rate, - lambda_, + lambda_ = 0.01, epsilon = 1e-07, - use_locking = FALSE, + ord = "fro", name = "ConditionalGradient", - clipnorm = NULL, - clipvalue = NULL, - decay = NULL, - lr = NULL + ... ) } \arguments{ @@ -23,17 +20,9 @@ optimizer_conditional_gradient( \item{epsilon}{A Tensor or a floating point value. A small constant for numerical stability when handling the case of norm of gradient to be zero.} -\item{use_locking}{If True, use locks for update operations.} - \item{name}{Optional name prefix for the operations created when applying gradients. Defaults to 'ConditionalGradient'.} -\item{clipnorm}{is clip gradients by norm.} - -\item{clipvalue}{is clip gradients by value.} - -\item{decay}{is included for backward compatibility to allow time inverse decay of learning rate.} - -\item{lr}{is included for backward compatibility, recommended to use learning_rate instead.} +\item{...}{keyword arguments. Allowed to be {clipnorm, clipvalue, lr, decay}. clipnorm is clip gradients by norm; clipvalue is clip gradients by value, decay is included for backward compatibility to allow time inverse decay of learning rate. lr is included for backward compatibility, recommended to use learning_rate instead.} } \value{ Optimizer for use with `keras::compile()` diff --git a/man/optimizer_moving_average.Rd b/man/optimizer_moving_average.Rd index 50c0bd8..5f43399 100644 --- a/man/optimizer_moving_average.Rd +++ b/man/optimizer_moving_average.Rd @@ -6,38 +6,30 @@ \usage{ optimizer_moving_average( optimizer, - sequential_update = TRUE, average_decay = 0.99, num_updates = NULL, + start_step = 0, + dynamic_decay = FALSE, name = "MovingAverage", - clipnorm = NULL, - clipvalue = NULL, - decay = NULL, - lr = NULL + ... ) } \arguments{ \item{optimizer}{str or tf$keras$optimizers$Optimizer that will be used to compute and apply gradients.} -\item{sequential_update}{Bool. If False, will compute the moving average at the same -time as the model is updated, potentially doing benign data races. If True, will update -the moving average after gradient updates.} - \item{average_decay}{float. Decay to use to maintain the moving averages of trained variables.} \item{num_updates}{Optional count of the number of updates applied to variables.} -\item{name}{Optional name for the operations created when applying gradients. -Defaults to "MovingAverage".} - -\item{clipnorm}{is clip gradients by norm.} +\item{start_step}{int. What step to start the moving average.} -\item{clipvalue}{is clip gradients by value.} +\item{dynamic_decay}{bool. Whether to change the decay based on the number of optimizer updates. Decay will start at 0.1 and gradually increase up to average_decay after each optimizer update.} -\item{decay}{is included for backward compatibility to allow time inverse decay of learning rate.} +\item{name}{Optional name for the operations created when applying gradients. +Defaults to "MovingAverage".} -\item{lr}{is included for backward compatibility, recommended to use learning_rate instead.} +\item{...}{keyword arguments. Allowed to be {clipnorm, clipvalue, lr, decay}. clipnorm is clip gradients by norm; clipvalue is clip gradients by value, decay is included for backward compatibility to allow time inverse decay of learning rate. lr is included for backward compatibility, recommended to use learning_rate instead.} } \value{ Optimizer for use with `keras::compile()` diff --git a/man/optimizer_swa.Rd b/man/optimizer_swa.Rd index ca7c6b6..8cc0d97 100644 --- a/man/optimizer_swa.Rd +++ b/man/optimizer_swa.Rd @@ -9,11 +9,7 @@ optimizer_swa( start_averaging = 0, average_period = 10, name = "SWA", - sequential_update = TRUE, - clipnorm = NULL, - clipvalue = NULL, - decay = NULL, - lr = NULL + ... ) } \arguments{ @@ -28,17 +24,7 @@ average_period steps. Averaging period needs to be >= 1.} \item{name}{Optional name for the operations created when applying gradients. Defaults to 'SWA'.} -\item{sequential_update}{Bool. If FALSE, will compute the moving average at the same time as the -model is updated, potentially doing benign data races. If True, will update the moving average -after gradient updates} - -\item{clipnorm}{is clip gradients by norm.} - -\item{clipvalue}{is clip gradients by value.} - -\item{decay}{is included for backward compatibility to allow time inverse decay of learning rate.} - -\item{lr}{is included for backward compatibility, recommended to use learning_rate instead.} +\item{...}{keyword arguments. Allowed to be {clipnorm, clipvalue, lr, decay}. clipnorm is clip gradients by norm; clipvalue is clip gradients by value, decay is included for backward compatibility to allow time inverse decay of learning rate. lr is included for backward compatibility, recommended to use learning_rate instead.} } \value{ Optimizer for use with `keras::compile()` From 40ddace8b33be438445f4d89ec884a6103af8f63 Mon Sep 17 00:00:00 2001 From: turgut090 Date: Mon, 11 Sep 2023 10:58:53 +0400 Subject: [PATCH 16/24] update docs --- R/losses.R | 1 - R/metrics.R | 2 +- R/optimizers.R | 2 +- R/rnn.R | 1 - R/seq2seq.R | 29 +-------------------------- man/metric_rsquare.Rd | 10 +-------- man/optimizer_conditional_gradient.Rd | 2 ++ 7 files changed, 6 insertions(+), 41 deletions(-) diff --git a/R/losses.R b/R/losses.R index 748636c..0dbd251 100644 --- a/R/losses.R +++ b/R/losses.R @@ -242,7 +242,6 @@ attr(loss_pinball, "py_function_name") <- "pinball" #' @title Sigmoid focal crossentropy loss #' -#' #' @param name (Optional) name for the loss. #' @param alpha balancing factor. #' @param gamma modulating factor. diff --git a/R/metrics.R b/R/metrics.R index 96d79f5..ad203e5 100644 --- a/R/metrics.R +++ b/R/metrics.R @@ -396,7 +396,7 @@ metric_multilabel_confusion_matrix <- function(num_classes, #' @title RSquare #' -#' This is also called as coefficient of determination. It tells how close +#' @description This is also called as coefficient of determination. It tells how close #' are data to the fitted regression line. Highest score can be 1.0 and it #' indicates that the predictors perfectly accounts for variation in the target. #' Score 0.0 indicates that the predictors do not account for variation in the diff --git a/R/optimizers.R b/R/optimizers.R index b74f17e..a6fe2a9 100644 --- a/R/optimizers.R +++ b/R/optimizers.R @@ -53,7 +53,7 @@ optimizer_lazy_adam <- function(learning_rate = 0.001, beta_1 = 0.9, beta_2 = 0. attr(optimizer_lazy_adam, "py_function_name") <- "lazy_adam" #' @title Conditional Gradient -#' +#' @param ord Order of the norm. Supported values are 'fro' and 'nuclear'. Default is 'fro', which is frobenius norm. #' @param learning_rate A Tensor or a floating point value, or a schedule that is a tf$keras$optimizers$schedules$LearningRateSchedule The learning rate. #' @param lambda_ A Tensor or a floating point value. The constraint. #' @param epsilon A Tensor or a floating point value. A small constant for numerical stability when handling the case of norm of gradient to be zero. diff --git a/R/rnn.R b/R/rnn.R index e5a1f0c..126f077 100644 --- a/R/rnn.R +++ b/R/rnn.R @@ -1,6 +1,5 @@ #' @title LSTM cell with layer normalization and recurrent dropout. #' -#' #' @details This class adds layer normalization and recurrent dropout to a LSTM unit. Layer #' normalization implementation is based on: https://arxiv.org/abs/1607.06450. #' "Layer Normalization" Jimmy Lei Ba, Jamie Ryan Kiros, Geoffrey E. Hinton and is diff --git a/R/seq2seq.R b/R/seq2seq.R index fcfc405..8ce112f 100644 --- a/R/seq2seq.R +++ b/R/seq2seq.R @@ -1,7 +1,5 @@ #' @title Attention Wrapper #' -#' -#' #' @param object Model or layer object #' @param cell An instance of RNNCell. #' @param attention_mechanism A list of AttentionMechanism instances or a single instance. @@ -348,8 +346,6 @@ decoder_basic <- function(object, #' @title Basic decoder output #' -#' -#' #' @param rnn_output the output of RNN cell #' @param sample_id the `id` of the sample #' @return None @@ -429,8 +425,6 @@ decoder_beam_search <- function(object, #' @title Beam Search Decoder Output #' -#' -#' #' @param scores calculate the scores for each beam #' @param predicted_ids The final prediction. A tensor of shape #' `[batch_size, T, beam_width]` (or `[T, batch_size, beam_width]` if `output_time_major` @@ -455,7 +449,6 @@ decoder_beam_search_output <- function(scores, predicted_ids, parent_ids) { #' @title Beam Search Decoder State #' -#' #' @param cell_state cell_state #' @param log_probs log_probs #' @param finished finished @@ -481,10 +474,6 @@ decoder_beam_search_state <- function(cell_state, log_probs, #' @title Base abstract class that allows the user to customize sampling. #' -#' -#' -#' -#' #' @param initialize_fn callable that returns (finished, next_inputs) for the first iteration. #' @param sample_fn callable that takes (time, outputs, state) and emits tensor sample_ids. #' @param next_inputs_fn callable that takes (time, outputs, state, sample_ids) and emits @@ -623,7 +612,6 @@ decoder_final_beam_search_output <- function(predicted_ids, beam_search_decoder_ #' @title Gather tree #' -#' #' @param step_ids requires the step id #' @param parent_ids The parent ids of shape `[max_time, batch_size, beam_width]`. #' @param max_sequence_lengths get max_sequence_length across all beams for each batch. @@ -733,10 +721,8 @@ hardmax <- function(logits, name = NULL) { #' @title Inference Sampler #' -#' #' @details A helper to use during inference with a custom sampling function. #' -#' #' @param sample_fn A callable that takes outputs and emits tensor sample_ids. #' @param sample_shape Either a list of integers, or a 1-D Tensor of type int32, #' the shape of the each sample in the batch returned by sample_fn. @@ -972,13 +958,10 @@ safe_cumprod <- function(x, ...) { #' @title Sample Embedding Sampler #' -#' -#' #' @description A sampler for use during inference. #' @details Uses sampling (from a distribution) instead of argmax and passes #' the result through an embedding layer to get the next input. #' -#' #' @param embedding_fn (Optional) A callable that takes a vector tensor of ids (argmax ids), #' or the params argument for embedding_lookup. The returned tensor will be passed to the #' decoder input. @@ -1011,10 +994,8 @@ sampler_sample_embedding <- function(embedding_fn = NULL, #' @title Sampler -#' @description Interface for implementing sampling in seq2seq decoders. -#' -#' #' +#' @description Interface for implementing sampling in seq2seq decoders. #' #' @param ... parametr to pass batch_size, initialize, next_inputs, sample, sample_ids_dtype, sample_ids_shape #' @@ -1031,10 +1012,6 @@ sampler <- function(...) { #' @title A training sampler that adds scheduled sampling #' -#' -#' -#' -#' #' @param sampling_probability A float32 0-D or 1-D tensor: the probability of sampling #' categorically from the output ids instead of reading directly from the inputs. #' @param embedding_fn A callable that takes a vector tensor of ids (argmax ids), or the @@ -1162,12 +1139,8 @@ tile_batch <- function(t, multiplier, name = NULL) { #' @title A Sampler for use during training. #' -#' #' @description Only reads inputs. #' -#' -#' -#' #' @param time_major bool. Whether the tensors in inputs are time major. #' If `FALSE` (default), they are assumed to be batch major. #' diff --git a/man/metric_rsquare.Rd b/man/metric_rsquare.Rd index 4778046..098d29c 100644 --- a/man/metric_rsquare.Rd +++ b/man/metric_rsquare.Rd @@ -2,13 +2,7 @@ % Please edit documentation in R/metrics.R \name{metric_rsquare} \alias{metric_rsquare} -\title{RSquare - -This is also called as coefficient of determination. It tells how close -are data to the fitted regression line. Highest score can be 1.0 and it -indicates that the predictors perfectly accounts for variation in the target. -Score 0.0 indicates that the predictors do not account for variation in the -target. It can also be negative if the model is worse.} +\title{RSquare} \usage{ metric_rsquare( name = "r_square", @@ -33,8 +27,6 @@ metric_rsquare( r squared score: float } \description{ -RSquare - This is also called as coefficient of determination. It tells how close are data to the fitted regression line. Highest score can be 1.0 and it indicates that the predictors perfectly accounts for variation in the target. diff --git a/man/optimizer_conditional_gradient.Rd b/man/optimizer_conditional_gradient.Rd index e3d53c4..80ce9ea 100644 --- a/man/optimizer_conditional_gradient.Rd +++ b/man/optimizer_conditional_gradient.Rd @@ -20,6 +20,8 @@ optimizer_conditional_gradient( \item{epsilon}{A Tensor or a floating point value. A small constant for numerical stability when handling the case of norm of gradient to be zero.} +\item{ord}{Order of the norm. Supported values are 'fro' and 'nuclear'. Default is 'fro', which is frobenius norm.} + \item{name}{Optional name prefix for the operations created when applying gradients. Defaults to 'ConditionalGradient'.} \item{...}{keyword arguments. Allowed to be {clipnorm, clipvalue, lr, decay}. clipnorm is clip gradients by norm; clipvalue is clip gradients by value, decay is included for backward compatibility to allow time inverse decay of learning rate. lr is included for backward compatibility, recommended to use learning_rate instead.} From 8f062c486ae01464aecf91a97af138e125da4d5f Mon Sep 17 00:00:00 2001 From: turgut090 Date: Mon, 11 Sep 2023 10:58:59 +0400 Subject: [PATCH 17/24] yaml space --- .github/workflows/tfaddons_stable.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/tfaddons_stable.yml b/.github/workflows/tfaddons_stable.yml index 0845d5b..c0d5974 100644 --- a/.github/workflows/tfaddons_stable.yml +++ b/.github/workflows/tfaddons_stable.yml @@ -55,6 +55,7 @@ jobs: Rscript -e "tensorflow::install_tensorflow(version = Sys.getenv('TF_VERSION'))" Rscript -e "reticulate::py_install(c('setuptools', 'wheel', 'requests', 'tqdm'), pip = TRUE)" Rscript -e "tfaddons::install_tfaddons()" + - name: Check continue-on-error: ${{ matrix.config.allow_failure }} From 0b0c9b179a227a21ed51cd4a1ac32ffaff53b8b9 Mon Sep 17 00:00:00 2001 From: turgut090 Date: Mon, 11 Sep 2023 11:01:21 +0400 Subject: [PATCH 18/24] only tqdm --- .github/workflows/tfaddons_stable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tfaddons_stable.yml b/.github/workflows/tfaddons_stable.yml index c0d5974..fbddb69 100644 --- a/.github/workflows/tfaddons_stable.yml +++ b/.github/workflows/tfaddons_stable.yml @@ -53,7 +53,7 @@ jobs: run: | Rscript -e "remotes::install_local()" Rscript -e "tensorflow::install_tensorflow(version = Sys.getenv('TF_VERSION'))" - Rscript -e "reticulate::py_install(c('setuptools', 'wheel', 'requests', 'tqdm'), pip = TRUE)" + Rscript -e "reticulate::py_install('tqdm', pip = TRUE)" Rscript -e "tfaddons::install_tfaddons()" - name: Check From 05dbd93078f5a5080a079e1d34d1dc6f66962b48 Mon Sep 17 00:00:00 2001 From: turgut090 Date: Mon, 18 Sep 2023 12:48:29 +0400 Subject: [PATCH 19/24] r update --- .github/workflows/tfaddons_stable.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tfaddons_stable.yml b/.github/workflows/tfaddons_stable.yml index fbddb69..098c186 100644 --- a/.github/workflows/tfaddons_stable.yml +++ b/.github/workflows/tfaddons_stable.yml @@ -14,7 +14,7 @@ jobs: config: - { os: windows-latest, tf: '2.13.0', tensorflow-addons: '0.21.0'} - { os: macOS-latest, tf: '2.13.0', tensorflow-addons: '0.21.0'} - - { os: ubuntu-latest, cran: "https://demo.rstudiopm.com/all/__linux__/xenial/latest", tf: '2.13.0', tensorflow-addons: '0.21.0'} + - { os: ubuntu-latest, tf: '2.13.0', tensorflow-addons: '0.21.0'} env: R_REMOTES_NO_ERRORS_FROM_WARNINGS: true @@ -29,7 +29,7 @@ jobs: - uses: r-lib/actions/setup-r@v2 with: - r-version: '4.1.0' + r-version: '4.3.0' - uses: r-lib/actions/setup-pandoc@v2 - name: Install dependencies Linux From a840a313ba3cb55766e312fad386ef321aef07e1 Mon Sep 17 00:00:00 2001 From: turgut090 Date: Mon, 18 Sep 2023 13:11:31 +0400 Subject: [PATCH 20/24] bump version --- .github/workflows/tfaddons_stable.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tfaddons_stable.yml b/.github/workflows/tfaddons_stable.yml index 098c186..4cefd90 100644 --- a/.github/workflows/tfaddons_stable.yml +++ b/.github/workflows/tfaddons_stable.yml @@ -12,9 +12,9 @@ jobs: fail-fast: false matrix: config: - - { os: windows-latest, tf: '2.13.0', tensorflow-addons: '0.21.0'} - - { os: macOS-latest, tf: '2.13.0', tensorflow-addons: '0.21.0'} - - { os: ubuntu-latest, tf: '2.13.0', tensorflow-addons: '0.21.0'} + - { os: windows-latest, tf: '2.10.0', tensorflow-addons: '0.21.0'} + - { os: macOS-latest, tf: '2.10.0', tensorflow-addons: '0.21.0'} + - { os: ubuntu-latest, tf: '2.10.0', tensorflow-addons: '0.21.0'} env: R_REMOTES_NO_ERRORS_FROM_WARNINGS: true @@ -48,7 +48,7 @@ jobs: run: | Rscript -e "install.packages('reticulate')" Rscript -e "try(reticulate::install_miniconda())" - Rscript -e "reticulate::conda_create('r-reticulate', packages = 'python==3.10')" + Rscript -e "reticulate::conda_create('r-reticulate', packages = 'python==3.8')" - name: Install TensorFlow run: | Rscript -e "remotes::install_local()" From 70af662bf3473a160db3b66c3a591df878375981 Mon Sep 17 00:00:00 2001 From: turgut090 Date: Tue, 19 Sep 2023 17:48:55 +0400 Subject: [PATCH 21/24] fix ubuntu --- .github/workflows/tfaddons_stable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tfaddons_stable.yml b/.github/workflows/tfaddons_stable.yml index 4cefd90..b07bf25 100644 --- a/.github/workflows/tfaddons_stable.yml +++ b/.github/workflows/tfaddons_stable.yml @@ -36,7 +36,7 @@ jobs: if: runner.os == 'Linux' run: | sudo apt-get update && sudo apt-get upgrade - sudo apt-get install curl + sudo apt-get install libcurl4-openssl-dev - name: Install deps run: | From 52aa1cced2244d8eaf93702f0a526551e3da0e7f Mon Sep 17 00:00:00 2001 From: turgut090 Date: Tue, 19 Sep 2023 17:49:04 +0400 Subject: [PATCH 22/24] fix --- .DS_Store | Bin 10244 -> 10244 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/.DS_Store b/.DS_Store index 816491b3ac6c022626aec65b67cd578f86d994dc..3e5662fca0cc710e9dc2579f59a300cbba684309 100644 GIT binary patch delta 41 xcmZn(XbG6$¥U^hRb!e$gfW48;s34EYR243(Za`N>H+`AG~6 z3<3-cjIEPT3byL0#09L6ULI3~& From 64e08318886dc5305bb696eb447a2b62af14a195 Mon Sep 17 00:00:00 2001 From: turgut090 Date: Tue, 19 Sep 2023 17:53:01 +0400 Subject: [PATCH 23/24] swtich to old mac os --- .github/workflows/tfaddons_stable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tfaddons_stable.yml b/.github/workflows/tfaddons_stable.yml index b07bf25..0da841f 100644 --- a/.github/workflows/tfaddons_stable.yml +++ b/.github/workflows/tfaddons_stable.yml @@ -13,7 +13,7 @@ jobs: matrix: config: - { os: windows-latest, tf: '2.10.0', tensorflow-addons: '0.21.0'} - - { os: macOS-latest, tf: '2.10.0', tensorflow-addons: '0.21.0'} + - { os: macos-11, tf: '2.10.0', tensorflow-addons: '0.21.0'} - { os: ubuntu-latest, tf: '2.10.0', tensorflow-addons: '0.21.0'} env: From b0e9b6aa762932cb932ee41ecb71d35e042c913d Mon Sep 17 00:00:00 2001 From: turgut090 Date: Tue, 19 Sep 2023 18:22:35 +0400 Subject: [PATCH 24/24] bump tf version --- .github/workflows/tfaddons_stable.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tfaddons_stable.yml b/.github/workflows/tfaddons_stable.yml index 0da841f..39088ba 100644 --- a/.github/workflows/tfaddons_stable.yml +++ b/.github/workflows/tfaddons_stable.yml @@ -12,9 +12,9 @@ jobs: fail-fast: false matrix: config: - - { os: windows-latest, tf: '2.10.0', tensorflow-addons: '0.21.0'} - - { os: macos-11, tf: '2.10.0', tensorflow-addons: '0.21.0'} - - { os: ubuntu-latest, tf: '2.10.0', tensorflow-addons: '0.21.0'} + - { os: windows-latest, tf: '2.13.0', tensorflow-addons: '0.21.0'} + - { os: macos-11, tf: '2.13.0', tensorflow-addons: '0.21.0'} + - { os: ubuntu-latest, tf: '2.13.0', tensorflow-addons: '0.21.0'} env: R_REMOTES_NO_ERRORS_FROM_WARNINGS: true