From a99abad9fe70805ff4d4b0891c3c022889de784f Mon Sep 17 00:00:00 2001 From: Jonathan Keane Date: Sun, 1 Aug 2021 17:59:16 -0600 Subject: [PATCH 1/5] try installing r-debug from npr's branch --- dev/tasks/docker-tests/azure.linux.yml | 9 +++++++++ dev/tasks/tasks.yml | 10 ++++++++++ docker-compose.yml | 23 +++++++++++++++++++++++ 3 files changed, 42 insertions(+) diff --git a/dev/tasks/docker-tests/azure.linux.yml b/dev/tasks/docker-tests/azure.linux.yml index c3706be443463..2b7252d19fda7 100644 --- a/dev/tasks/docker-tests/azure.linux.yml +++ b/dev/tasks/docker-tests/azure.linux.yml @@ -45,6 +45,15 @@ jobs: git -C arrow submodule update --init --recursive displayName: Clone arrow + # only needed for r-lto job to use until https://github.com/wch/r-debug/pull/22 is merged + - script: | + git clone https://github.com/nealrichardson/r-debug.git + git checkout lto + cd r-debug + ./buildall.sh + condition: contains(variables['LTO'], 'true') + displayName: build r-debug + - script: pip install -e arrow/dev/archery[docker] displayName: Setup Archery diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml index c6c26a367ef7b..76e0d526dd8cc 100644 --- a/dev/tasks/tasks.yml +++ b/dev/tasks/tasks.yml @@ -979,8 +979,18 @@ tasks: env: ARROW_R_DEV: "TRUE" UBUNTU: 18.04 + LTO: true run: ubuntu-r-valgrind + test-r-lto: + ci: azure + template: docker-tests/azure.linux.yml + params: + env: + ARROW_R_DEV: "TRUE" + UBUNTU: 18.04 + run: ubuntu-r-lto + test-r-linux-rchk: ci: github template: r/github.linux.rchk.yml diff --git a/docker-compose.yml b/docker-compose.yml index 4290578b9bdf0..26a041963c289 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1146,6 +1146,29 @@ services: /bin/bash -c " /arrow/ci/scripts/r_valgrind.sh /arrow" + ubuntu-r-lto: + # Only 18.04 and amd64 supported + # Usage: + # docker-compose build ubuntu-r-lto + # docker-compose run ubuntu-r-lto + image: ${REPO}:amd64-ubuntu-18.04-r-lto + build: + context: . + dockerfile: ci/docker/linux-r.dockerfile + cache_from: + - ${REPO}:amd64-ubuntu-18.04-r-lto + args: + base: wch1/r-debug + r_bin: RDlto + tz: ${TZ} + environment: + <<: *ccache + ARROW_R_DEV: ${ARROW_R_DEV} + volumes: *ubuntu-volumes + command: > + /bin/bash -c " + /arrow/ci/scripts/r_test.sh /arrow" + r-revdepcheck: # Usage: # docker-compose build r-revdepcheck From 5f2bc1de670eadc4e298296682ba7bca183b4097 Mon Sep 17 00:00:00 2001 From: Jonathan Keane Date: Sun, 1 Aug 2021 18:05:52 -0600 Subject: [PATCH 2/5] add ubuntu-r-lto to the hierarchy --- docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yml b/docker-compose.yml index 26a041963c289..e832bebf975b2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -134,6 +134,7 @@ x-hierarchy: - ubuntu-cpp-thread-sanitizer - ubuntu-r-sanitizer - ubuntu-r-valgrind + - ubuntu-r-lto - python-sdist - r - r-revdepcheck From c250042325a7da07cf77e0eb1649a37fd7397777 Mon Sep 17 00:00:00 2001 From: Jonathan Keane Date: Sun, 1 Aug 2021 21:38:50 -0600 Subject: [PATCH 3/5] oops --- dev/tasks/tasks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml index 76e0d526dd8cc..be18e89edde23 100644 --- a/dev/tasks/tasks.yml +++ b/dev/tasks/tasks.yml @@ -979,7 +979,6 @@ tasks: env: ARROW_R_DEV: "TRUE" UBUNTU: 18.04 - LTO: true run: ubuntu-r-valgrind test-r-lto: @@ -989,6 +988,7 @@ tasks: env: ARROW_R_DEV: "TRUE" UBUNTU: 18.04 + LTO: true run: ubuntu-r-lto test-r-linux-rchk: From e278e8ac2a8d3c922794f38a5ff1f96e20b96449 Mon Sep 17 00:00:00 2001 From: Jonathan Keane Date: Mon, 2 Aug 2021 10:49:57 -0600 Subject: [PATCH 4/5] transition to rhub lto option --- dev/tasks/docker-tests/azure.linux.yml | 9 --------- dev/tasks/tasks.yml | 13 ++----------- docker-compose.yml | 24 ------------------------ 3 files changed, 2 insertions(+), 44 deletions(-) diff --git a/dev/tasks/docker-tests/azure.linux.yml b/dev/tasks/docker-tests/azure.linux.yml index 2b7252d19fda7..c3706be443463 100644 --- a/dev/tasks/docker-tests/azure.linux.yml +++ b/dev/tasks/docker-tests/azure.linux.yml @@ -45,15 +45,6 @@ jobs: git -C arrow submodule update --init --recursive displayName: Clone arrow - # only needed for r-lto job to use until https://github.com/wch/r-debug/pull/22 is merged - - script: | - git clone https://github.com/nealrichardson/r-debug.git - git checkout lto - cd r-debug - ./buildall.sh - condition: contains(variables['LTO'], 'true') - displayName: build r-debug - - script: pip install -e arrow/dev/archery[docker] displayName: Setup Archery diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml index be18e89edde23..99d6082ca9986 100644 --- a/dev/tasks/tasks.yml +++ b/dev/tasks/tasks.yml @@ -981,16 +981,6 @@ tasks: UBUNTU: 18.04 run: ubuntu-r-valgrind - test-r-lto: - ci: azure - template: docker-tests/azure.linux.yml - params: - env: - ARROW_R_DEV: "TRUE" - UBUNTU: 18.04 - LTO: true - run: ubuntu-r-lto - test-r-linux-rchk: ci: github template: r/github.linux.rchk.yml @@ -1024,7 +1014,8 @@ tasks: ("rstudio", "r-base", "3.6-bionic"), ("rstudio", "r-base", "3.6-centos8"), ("rstudio", "r-base", "3.6-opensuse15"), - ("rstudio", "r-base", "3.6-opensuse42")] %} + ("rstudio", "r-base", "3.6-opensuse42"), + ("rhub", "debian-gcc-devel-lto", "latest")] %} test-r-{{ r_org }}-{{ r_image }}-{{ r_tag }}: ci: azure template: r/azure.linux.yml diff --git a/docker-compose.yml b/docker-compose.yml index e832bebf975b2..4290578b9bdf0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -134,7 +134,6 @@ x-hierarchy: - ubuntu-cpp-thread-sanitizer - ubuntu-r-sanitizer - ubuntu-r-valgrind - - ubuntu-r-lto - python-sdist - r - r-revdepcheck @@ -1147,29 +1146,6 @@ services: /bin/bash -c " /arrow/ci/scripts/r_valgrind.sh /arrow" - ubuntu-r-lto: - # Only 18.04 and amd64 supported - # Usage: - # docker-compose build ubuntu-r-lto - # docker-compose run ubuntu-r-lto - image: ${REPO}:amd64-ubuntu-18.04-r-lto - build: - context: . - dockerfile: ci/docker/linux-r.dockerfile - cache_from: - - ${REPO}:amd64-ubuntu-18.04-r-lto - args: - base: wch1/r-debug - r_bin: RDlto - tz: ${TZ} - environment: - <<: *ccache - ARROW_R_DEV: ${ARROW_R_DEV} - volumes: *ubuntu-volumes - command: > - /bin/bash -c " - /arrow/ci/scripts/r_test.sh /arrow" - r-revdepcheck: # Usage: # docker-compose build r-revdepcheck From 2a8fc1942e491b0d0eec248ebe9c3196c143b6c6 Mon Sep 17 00:00:00 2001 From: Jonathan Keane Date: Wed, 4 Aug 2021 09:07:45 -0500 Subject: [PATCH 5/5] useLTO: false --- r/DESCRIPTION | 1 + 1 file changed, 1 insertion(+) diff --git a/r/DESCRIPTION b/r/DESCRIPTION index a0c4b61b7a04c..fe0c9c33e6172 100644 --- a/r/DESCRIPTION +++ b/r/DESCRIPTION @@ -115,3 +115,4 @@ Collate: 'reexports-tidyselect.R' 'schema.R' 'util.R' +UseLTO: false