Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Canonicalize scripts #264

Merged
merged 25 commits into from
May 10, 2021
Merged

Canonicalize scripts #264

merged 25 commits into from
May 10, 2021

Conversation

e3m3
Copy link
Contributor

@e3m3 e3m3 commented Apr 5, 2021

Closes #263. Depends on #261.

Changes:

  • 'install_deps.sh' now shows the help message when run with no arguments
  • Updated help message in 'install_deps.sh'
  • New 'deps.sh' file tracking dependency directory configurations
  • 'Dockerfile' now defaults to 'Release' for cmake installs
  • 'Dockerfile' now accepts an 'ACTION' argument for Runner
  • 'Dockerfile' now defaults to Ubuntu 20.04
  • Manual or interactive ('install_deps.sh') script runs default to 'RelWithDebInfo' for cmake installs
  • Removed 'temp_dir' from 'Dockerfile'
  • Updated 'GTEST_LOC' to generate from 'deps.sh' in 'common/common.mk'
  • New 'install_prompt' utility in 'install_deps.sh' for clearing old installs
  • Canonicalized install script structure (fetch -> build -> install -> log)
  • Updated CUDA installation detection in 'scripts/install_apt_deps.sh'
  • Added dependency info logging and configuration loading (default to '.deps/')
  • Added '.deps' to '.gitignore'

@e3m3 e3m3 added bug Something isn't working feature New feature or request infrastructure Build and deployment infrastructure plumbing Something that connects/interfaces/plugs into many parts of ILLIXR. labels Apr 5, 2021
@e3m3 e3m3 requested review from charmoniumQ and mhuzai April 5, 2021 23:22
@e3m3 e3m3 self-assigned this Apr 5, 2021
@e3m3 e3m3 added this to PRs in Progress in ILLIXR improvements via automation Apr 5, 2021
@e3m3 e3m3 marked this pull request as draft April 5, 2021 23:22
@e3m3
Copy link
Contributor Author

e3m3 commented Apr 5, 2021

Pardon the bash scripts. These prototypes should be moved to Python (or similar) once the build/package interfaces are more mature, and should reflect the results of #104's discussions.

@e3m3
Copy link
Contributor Author

e3m3 commented Apr 5, 2021

Closes #256.

@e3m3 e3m3 linked an issue Apr 5, 2021 that may be closed by this pull request
@e3m3 e3m3 force-pushed the issue-263-canonicalize-scripts branch from 8766350 to 743ba9c Compare April 6, 2021 14:31
@e3m3 e3m3 marked this pull request as ready for review April 6, 2021 15:59
charmoniumQ
charmoniumQ previously approved these changes Apr 6, 2021
Copy link
Member

@charmoniumQ charmoniumQ left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nix is an obvious priority. This will serve us well until then.

install_deps.sh Outdated Show resolved Hide resolved
install_deps.sh Outdated
else
dep_log_path_conda="${dep_log_path}"
src_dir_conda="${parent_dir_conda}/${dep_name_conda}"
print_warning "Installation log for conda not found at '${dep_log_path_conda}'."
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does conda not found imply we should quit?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah I think it would be safe to abort here. The script is written to try for conda anyway below as a stop-gap (detect_dependency is only looking for a log entry in .deps/, but conda can still have been installed via a previous version of the script, or via the system).

ILLIXR improvements automation moved this from PRs in Progress to PRs in Review Apr 6, 2021
@charmoniumQ charmoniumQ self-requested a review April 6, 2021 23:23
charmoniumQ
charmoniumQ previously approved these changes Apr 6, 2021
charmoniumQ
charmoniumQ previously approved these changes Apr 9, 2021
@e3m3 e3m3 force-pushed the issue-263-canonicalize-scripts branch 4 times, most recently from fb17488 to 7c2b7be Compare April 20, 2021 14:12
charmoniumQ
charmoniumQ previously approved these changes Apr 22, 2021
e3m3 added 17 commits May 10, 2021 17:23
- Moved 'deps' -> '.cache/deps'
- Moved 'runner/environment.yml' -> '.cache/runner/environment.yml'
- Removed CUDA from OpenCV build/install
- Fixed type in 'docs/illixr_plugins.md'
- New clang dependency (10.0.1)
- New boost depdendecy (1.65.1)
- Removed 'clang-10' from 'scripts/install_apt_deps.sh'
- Removed 'libboost-all-dev' from 'scripts/install_apt_deps.sh'
- Fixed deps configuraton detection
- Fixed in conda environment creating in 'Dockerfile'
- Made 'scripts/install_clang.sh' executable
- Made 'scripts/install_boost.sh' executable
- Added clang and boost to 'Dockerfile'
- Fixed environment creation in 'install_deps.sh'
- Disabled boost installation (from source)
- Disabled clang installation (from source)
- New 'join_strings' utility in 'scripts/system_utils.sh'
@e3m3 e3m3 requested a review from charmoniumQ May 10, 2021 23:04
ILLIXR improvements automation moved this from PRs in Review to PRs Approved May 10, 2021
@mhuzai mhuzai merged commit 2e246e1 into master May 10, 2021
ILLIXR improvements automation moved this from PRs Approved to Done May 10, 2021
ILLIXR improvements automation moved this from Done to PRs Approved May 10, 2021
@mhuzai mhuzai deleted the issue-263-canonicalize-scripts branch May 25, 2021 23:15
@e3m3 e3m3 moved this from PRs Approved to Done in ILLIXR improvements May 26, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working feature New feature or request infrastructure Build and deployment infrastructure plumbing Something that connects/interfaces/plugs into many parts of ILLIXR.
Projects
Development

Successfully merging this pull request may close these issues.

CI and install scripts should be standardized and track dependencies install_deps.sh defaults to one thread
3 participants