[pytorch] consolidate android gradle build scripts #39999
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Summary: Cleaned up the android build scripts. Consolidated common functions into common.sh. Also made a few minor fixes: - We should trust build_android.sh doing right about reusing existing `build_android_$abi` directory; - We should clean up `pytorch_android/src/main/jniLibs/` to remove broken symbolic links in case custom abi list changes since last build; [ghstack-poisoned]
This was referenced Jun 14, 2020
ljk53
commented
Jun 14, 2020
| @@ -4,42 +4,10 @@ set -eux | |||
| PYTORCH_DIR="$(cd $(dirname $0)/..; pwd -P)" | |||
| PYTORCH_ANDROID_DIR=$PYTORCH_DIR/android | |||
|
|
|||
| echo "ANDROID_HOME:$ANDROID_HOME" | |||
| if [ ! -z "$ANDROID_HOME" ]; then | |||
There was a problem hiding this comment.
This should be if [ -z instead of if [ ! -z. It's fixed in the master build script but not here - consolidating these functions can avoid this type of inconsistency.
💊 CI failures summary and remediationsAs of commit 1f597a0 (more details on the Dr. CI page):
ci.pytorch.org: 1 failedThis comment was automatically generated by Dr. CI (expand for details).Follow this link to opt-out of these comments for your Pull Requests.Please report bugs/suggestions on the GitHub issue tracker or post in the (internal) Dr. CI Users group. This comment has been revised 14 times. |
Summary: Cleaned up the android build scripts. Consolidated common functions into common.sh. Also made a few minor fixes: - We should trust build_android.sh doing right about reusing existing `build_android_$abi` directory; - We should clean up `pytorch_android/src/main/jniLibs/` to remove broken symbolic links in case custom abi list changes since last build; [ghstack-poisoned]
ljk53
added a commit
that referenced
this pull request
Jun 14, 2020
Summary: Cleaned up the android build scripts. Consolidated common functions into common.sh. Also made a few minor fixes: - We should trust build_android.sh doing right about reusing existing `build_android_$abi` directory; - We should clean up `pytorch_android/src/main/jniLibs/` to remove broken symbolic links in case custom abi list changes since last build; ghstack-source-id: 2a17dd19dd151507fecd7ddf2b68fa609ebb4e88 Pull Request resolved: #39999
IvanKobzarev
approved these changes
Jun 15, 2020
Summary: Cleaned up the android build scripts. Consolidated common functions into common.sh. Also made a few minor fixes: - We should trust build_android.sh doing right about reusing existing `build_android_$abi` directory; - We should clean up `pytorch_android/src/main/jniLibs/` to remove broken symbolic links in case custom abi list changes since last build; Differential Revision: [D22036926](https://our.internmc.facebook.com/intern/diff/D22036926) [ghstack-poisoned]
ljk53
commented
Jun 15, 2020
|
|
||
| if [ ! -x "$(command -v gradle)" ]; then | ||
| if [ -z "$GRADLE_HOME" ]; then | ||
| echo GRADLE_NOT_FOUND_MSG |
There was a problem hiding this comment.
We were missing "$" here - fixed in the new revision as well.
Summary: Cleaned up the android build scripts. Consolidated common functions into common.sh. Also made a few minor fixes: - We should trust build_android.sh doing right about reusing existing `build_android_$abi` directory; - We should clean up `pytorch_android/src/main/jniLibs/` to remove broken symbolic links in case custom abi list changes since last build; Differential Revision: [D22036926](https://our.internmc.facebook.com/intern/diff/D22036926) [ghstack-poisoned]
ljk53
added a commit
that referenced
this pull request
Jun 15, 2020
Summary: Cleaned up the android build scripts. Consolidated common functions into common.sh. Also made a few minor fixes: - We should trust build_android.sh doing right about reusing existing `build_android_$abi` directory; - We should clean up `pytorch_android/src/main/jniLibs/` to remove broken symbolic links in case custom abi list changes since last build; ghstack-source-id: 2f16bafc83351b6efeac07ce186438c95eee3f13 Pull Request resolved: #39999
Summary: Cleaned up the android build scripts. Consolidated common functions into common.sh. Also made a few minor fixes: - We should trust build_android.sh doing right about reusing existing `build_android_$abi` directory; - We should clean up `pytorch_android/src/main/jniLibs/` to remove broken symbolic links in case custom abi list changes since last build; Differential Revision: [D22036926](https://our.internmc.facebook.com/intern/diff/D22036926) [ghstack-poisoned]
ljk53
added a commit
that referenced
this pull request
Jun 16, 2020
Summary: Cleaned up the android build scripts. Consolidated common functions into common.sh. Also made a few minor fixes: - We should trust build_android.sh doing right about reusing existing `build_android_$abi` directory; - We should clean up `pytorch_android/src/main/jniLibs/` to remove broken symbolic links in case custom abi list changes since last build; ghstack-source-id: 4021b4016c980851d201ab7dc9fc0e03c6fac8ef Pull Request resolved: #39999
xwang233
pushed a commit
to xwang233/pytorch
that referenced
this pull request
Jun 20, 2020
Summary: Pull Request resolved: pytorch#39999 Cleaned up the android build scripts. Consolidated common functions into common.sh. Also made a few minor fixes: - We should trust build_android.sh doing right about reusing existing `build_android_$abi` directory; - We should clean up `pytorch_android/src/main/jniLibs/` to remove broken symbolic links in case custom abi list changes since last build; Test Plan: Imported from OSS Differential Revision: D22036926 Pulled By: ljk53 fbshipit-source-id: e93915ee4f195111b6171cdabc667fa0135d5195
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Stack from ghstack:
Summary:
Cleaned up the android build scripts. Consolidated common functions into
common.sh. Also made a few minor fixes:
We should trust build_android.sh doing right about reusing existing
build_android_$abidirectory;We should clean up
pytorch_android/src/main/jniLibs/to removebroken symbolic links in case custom abi list changes since last build;
Differential Revision: D22036926