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..b03b7eb 100644 --- a/.github/workflows/tfaddons_stable.yml +++ b/.github/workflows/tfaddons_stable.yml @@ -12,16 +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.12.0', tensorflow-addons: '0.20.0'} + - { os: macOS-latest, tf: '2.12.0', tensorflow-addons: '0.20.0'} + - { os: ubuntu-latest, cran: "https://demo.rstudiopm.com/all/__linux__/xenial/latest", tf: '2.12.0', tensorflow-addons: '0.20.0'} env: R_REMOTES_NO_ERRORS_FROM_WARNINGS: true TF_VERSION: ${{ matrix.config.tf }} @@ -31,12 +24,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 + r-version: '4.2.1' + - uses: r-lib/actions/setup-pandoc@v2 - name: Install deps run: | @@ -48,7 +41,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.10')" - name: Install TensorFlow run: | Rscript -e "remotes::install_local()" 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") diff --git a/README.md b/README.md index 56d0d07..19dbb01 100644 --- a/README.md +++ b/README.md @@ -6,14 +6,11 @@ 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) +[![Last commit](https://img.shields.io/github/last-commit/eagerai/tfaddons.svg)](https://github.com/eagerai/tfaddons/commits/master) -![](https://img.shields.io/docker/cloud/build/turqut314/tfaddons?style=plastic) TF-addons @@ -39,7 +36,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*: