From 9022b3fce15530ba7755dc0bf9189f14051e0b18 Mon Sep 17 00:00:00 2001 From: harupy <17039389+harupy@users.noreply.github.com> Date: Wed, 5 Jan 2022 09:45:41 +0900 Subject: [PATCH 1/5] Remove mleap commands in .create-test-env.R Signed-off-by: harupy <17039389+harupy@users.noreply.github.com> --- mlflow/R/mlflow/.create-test-env.R | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/mlflow/R/mlflow/.create-test-env.R b/mlflow/R/mlflow/.create-test-env.R index c42babf63d0e2..240a39a5e0472 100644 --- a/mlflow/R/mlflow/.create-test-env.R +++ b/mlflow/R/mlflow/.create-test-env.R @@ -13,14 +13,3 @@ reticulate::conda_install("'h5py<3.0.0'", envname = mlflow:::mlflow_conda_env_na reticulate::conda_install(Sys.getenv("MLFLOW_HOME", "../../../../."), envname = mlflow:::mlflow_conda_env_name(), pip = TRUE) reticulate::conda_install("xgboost", envname = mlflow:::mlflow_conda_env_name()) reticulate::conda_install(paste0("h2o==", packageVersion("h2o")), envname = mlflow:::mlflow_conda_env_name(), pip = TRUE) - -# The default timeout value (60 seconds) can be insufficient for `spark_install` to complete -options(timeout=60 * 60) - -spark_version_file <- "../.spark-version" -spark_version <- trimws(readChar(spark_version_file, file.info(spark_version_file)$size)) - -# Install MLeap runtime and required dependencies -sparklyr::spark_install(version = spark_version, verbose = TRUE) -mleap::install_maven() -mleap::install_mleap(version = "0.16.0") From ca0d946216d71ccf6ad62607ac1a53dcb3c16ef8 Mon Sep 17 00:00:00 2001 From: harupy <17039389+harupy@users.noreply.github.com> Date: Wed, 5 Jan 2022 15:02:23 +0900 Subject: [PATCH 2/5] remove restore keys Signed-off-by: harupy <17039389+harupy@users.noreply.github.com> --- .github/workflows/master.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index b62dcbff32229..975d958241597 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -91,7 +91,6 @@ jobs: # We cache R dependencies based on a tuple of the current OS, the R version, and the list of # R dependencies key: ${{ steps.os-name.outputs.os-name }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }} - restore-keys: ${{ steps.os-name.outputs.os-name }}-${{ hashFiles('.github/R-version') }}-1- # Cache spark archive downloaded in `mlflow/R/mlflow/.create-test-env.R` - name: Cache spark archive uses: actions/cache@v2 From 6019d07b158833316bb35d380942120a6b26b042 Mon Sep 17 00:00:00 2001 From: harupy <17039389+harupy@users.noreply.github.com> Date: Wed, 5 Jan 2022 15:08:55 +0900 Subject: [PATCH 3/5] Remove mlflow/R/mlflow/.spark-version Signed-off-by: harupy <17039389+harupy@users.noreply.github.com> --- mlflow/R/mlflow/.spark-version | 1 - 1 file changed, 1 deletion(-) delete mode 100644 mlflow/R/mlflow/.spark-version diff --git a/mlflow/R/mlflow/.spark-version b/mlflow/R/mlflow/.spark-version deleted file mode 100644 index 59aa62c1fa4c2..0000000000000 --- a/mlflow/R/mlflow/.spark-version +++ /dev/null @@ -1 +0,0 @@ -2.4.5 From 5c838d68119b3206a1b2d4c4b9fecf630d3f7067 Mon Sep 17 00:00:00 2001 From: harupy <17039389+harupy@users.noreply.github.com> Date: Wed, 5 Jan 2022 15:32:53 +0900 Subject: [PATCH 4/5] remove spark cache Signed-off-by: harupy <17039389+harupy@users.noreply.github.com> --- .github/workflows/master.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 975d958241597..fe81ac7a6425e 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -91,12 +91,6 @@ jobs: # We cache R dependencies based on a tuple of the current OS, the R version, and the list of # R dependencies key: ${{ steps.os-name.outputs.os-name }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }} - # Cache spark archive downloaded in `mlflow/R/mlflow/.create-test-env.R` - - name: Cache spark archive - uses: actions/cache@v2 - with: - path: ~/spark/spark-2.4.5-bin-hadoop2.7 - key: ${{ hashFiles('mlflow/R/mlflow/.spark-version') }} - name: Install system dependencies run: | sudo apt-get install -y libcurl4-openssl-dev From 5632f2f19105ef05b05baef9e45074f4fe18b908 Mon Sep 17 00:00:00 2001 From: harupy <17039389+harupy@users.noreply.github.com> Date: Wed, 5 Jan 2022 15:33:37 +0900 Subject: [PATCH 5/5] remove if Signed-off-by: harupy <17039389+harupy@users.noreply.github.com> --- .github/workflows/master.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index fe81ac7a6425e..63493c10991c8 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -84,7 +84,6 @@ jobs: os_name=$(lsb_release -ds | sed 's/\s/-/g') echo "::set-output name=os-name::$os_name" - name: Cache R packages - if: runner.os != 'Windows' uses: actions/cache@v2 with: path: ${{ env.R_LIBS_USER }}