Skip to content

Latest commit

 

History

History
210 lines (144 loc) · 11.5 KB

CONTRIBUTING.md

File metadata and controls

210 lines (144 loc) · 11.5 KB

Contributing Guidelines

Thank you for your interest in contributing to our project. Whether it's a bug report, new feature, correction, or additional documentation, we greatly value feedback and contributions from our community.

Please read through this document before submitting any issues or pull requests to ensure we have all the necessary information to effectively respond to your bug report or contribution.

Reporting Bugs/Feature Requests

We welcome you to use the GitHub issue tracker to report bugs or suggest features.

When filing an issue, please check existing open, or recently closed, issues to make sure somebody else hasn't already reported the issue. Please try to include as much information as you can. Details like these are incredibly useful:

  • A reproducible test case or series of steps
  • The version of our code being used
  • Any modifications you've made relevant to the bug
  • Anything unusual about your environment or deployment

Contributing via Pull Requests

Contributions via pull requests are much appreciated. Before sending us a pull request, please ensure that:

  1. You are working against the latest source on the main branch.
  2. You check existing open, and recently merged, pull requests to make sure someone else hasn't addressed the problem already.
  3. You open an issue to discuss any significant work - we would hate for your time to be wasted.

To send us a pull request, please:

  1. Fork the repository.
  2. Modify the source; please focus on the specific change you are contributing. If you also reformat all the code, it will be hard for us to focus on your change.
  3. Ensure local tests pass.
  4. Commit to your fork using clear commit messages.
  5. Send us a pull request, answering any default questions in the pull request interface.
  6. Pay attention to any automated CI failures reported in the pull request, and stay involved in the conversation.

GitHub provides additional document on forking a repository and creating a pull request.

For adding new Conda packages to SageMaker Distribution

Follow these steps for sending out a pull request for adding new packages:

  1. Identify the latest version of SageMaker Distribution.

  2. Create the next minor/major version's build artifacts folder here: https://github.com/aws/sagemaker-distribution/tree/main/build_artifacts

  3. Currently, SageMaker Distribution is using Conda forge channel as our source (for Conda packages). Ensure that the new package which you are trying to add is present in Conda forge channel. https://conda-forge.org/feedstock-outputs/

  4. Create {cpu/gpu}.additional_packages_env.in file in that folder containing the new packages. Specify the new package based on the following examples:

    i. conda-forge::new-package

    ii. conda-forge::new-package[version='>=some-version-number,<some-version-number']

  5. Run the following commands to verify whether the new package which you are trying to add is compatible with the existing packages in SageMaker Distribution

    This project uses Conda to manage its dependencies. Run the following to setup your local environment:
    
    conda env update --file environment.lock -n sagemaker-distribution
    
    conda activate sagemaker-distribution
    
    export BASE_PATCH_VERSION='current.latest.version'
    
    # NEXT_VERSION refers to the version number corresponding to the folder you created as part
    of Step 2.
    
    export NEXT_VERSION='specify.next.version'
    
    # If NEXT_VERSION is a new minor version:
    
    python ./src/main.py create-minor-version-artifacts --base-patch-version=$BASE_PATCH_VERSION --force
    
    # Or for a new major version:
    
    python src/main.py create-major-version-artifacts --base-patch-version=$BASE_PATCH_VERSION --force
    
    # Build the image:
    python ./src/main.py build \
      --target-patch-version=$NEXT_VERSION --skip-tests
    
    
  6. Ensure that the build command succeeds. If it fails, then it means that the package isn't compatible with the existing packages in SageMaker Distribution. Create a Github Issue, so that we can look more into it.

  7. Add the relevant tests in https://github.com/aws/sagemaker-distribution/blob/main/test/test_dockerfile_based_harness.py and run the build command once again without --skip-tests flag.

    # When writing or debugging tests, you can use standard pytest commands and arguments (https://docs.pytest.org/en/8.0.x/how-to/usage.html) to run specific tests and change test execution behavior. Some useful commands:
    
    # The sagemaker-distribution conda env set up earlier should be activated before running below commands
    
    # Runs only tests for cpu image, verbose, shows reason for skipped tests
    python -m pytest -n auto -m cpu -vv -rs --local-image-version $VERSION
    
    # In addition to above, running only tests matching a name pattern
    python -m pytest -n auto -m cpu -vv -rs -k "<test_name>" --local-image-version $VERSION
    
  8. Submit the PR containing the following files.

    • {cpu/gpu}.additional_packages_env.in files
    • All the test files and test_dockerfile_based_harness.py changes

    Note: you don't have to include other files such as env.in/ env.out/ Dockerfile etc in your PR

    Also Note: We might ask you to include the test results as part of the PR.

Modifying the Dockerfile or dirs/ (static files)

Each minor version has its own template directory under template/v{major}/v{major}.{minor}/ containing a Dockerfile and a dirs/ folder. These are the static files that get copied into every new patch release of that minor version.

Template directory structure

template/
├── v2/
│   ├── v2.13/
│   │   ├── Dockerfile
│   │   └── dirs/
│   └── v2.14/
│       ├── Dockerfile
│       └── dirs/
├── v3/
│   ├── v3.8/
│   │   ├── Dockerfile
│   │   └── dirs/
│   └── v3.9/
│       ├── Dockerfile
│       └── dirs/
└── v4/
    ├── v4.0/
    ├── v4.1/
    ├── v4.2/
    └── v4.3/

Deciding where to make your change

Where you put a template change determines how far forward it reaches. The key fact: a given minor's template feeds all future patches of that same minor, but a new minor's template is created by copying the previous minor's template only once (see "How new minor version templates are auto-created at build time" below). So to reach future minor/major versions, your change must live in the newest minor template — if the current newest minor is already released, that means creating the next minor's template and putting the change there.

First, find the latest minor version that has a template directory (the highest v4.N):

ls -d template/v4/v4.*/

Then check whether a build artifact already exists for that minor version:

# Example: checking if v4.6 has any released patch version
ls build_artifacts/v4/v4.6/

There are two possible states:

  • Template exists, but NO build artifact exists yet (e.g., template/v4/v4.6/ exists but build_artifacts/v4/v4.6/ is empty or does not exist): this minor version has not been released. Update template/v4/v4.6/ directly — it is both the next patch and the newest minor, so the change reaches 4.6.0 and every minor created after it.

  • Template exists AND a build artifact exists (e.g., both template/v4/v4.6/ and build_artifacts/v4/v4.6/v4.6.0/ exist): this minor version has already been released. What you do depends on how far forward you want the change to reach:

    • To reach only future patches of this same minor (4.6.1, 4.6.2, …), edit template/v4/v4.6/ directly. The change will not reach any later minor/major version.

    • To reach future minor/major versions (4.7.0, 5.0.0, …), you must create the next minor version's template by copying from it, then make your change there:

      cp -r template/v4/v4.6 template/v4/v4.7
      # Now edit template/v4/v4.7/ with your change

      (If you want it in both the current minor's future patches and future minors, apply the change to template/v4/v4.6/ and the new template/v4/v4.7/.)

Include every template directory you created or edited in your PR, and open the PR against main. Because a new minor's template is created by copying the previous minor's template, landing your change in the newest minor template is what carries it into every minor created afterward.

Why this rule exists: templates are copied forward only once — at the moment a new minor version is first created (see "How new minor version templates are auto-created at build time" below). After that, each minor's template is an independent, frozen snapshot. So editing an already-released minor's template does not reach any newer minor. A common past mistake was editing v4.5 while v4.6 was already in flight: the change landed only in the v4.5 line and never reached v4.6+. Following the rule above avoids this — you always land the change on the newest minor template, creating it first if the current newest is already released.

Applying a security fix or infrastructure change (applies to all supported minor versions)

A security or infrastructure fix must reach every supported minor line, not just future ones. Apply the same fix to the templates of all supported minor versions, including the newest minor template (and, if the newest is already released and the fix must also reach future minors, a newly created next-minor template):

template/v4/v4.0/Dockerfile
template/v4/v4.1/Dockerfile
...
template/v4/v4.6/Dockerfile   # through the newest minor template
template/v4/v4.7/Dockerfile   # including any next-minor template you just created

Applying the fix to each template explicitly (rather than relying on copy-forward) is intentional — it makes the scope of the fix auditable and prevents accidental feature leakage.

How new minor version templates are auto-created at build time

If no one creates the template directory before create-minor-version-artifacts runs, the tooling will automatically copy it from the previous minor's template (e.g., v4.6 → v4.7). This copy happens exactly once per minor, when that minor's template is first created, and only ever copies from the immediately-preceding minor. There is no ongoing sync: once a minor's template exists, later edits to an older minor's template are never propagated into it. That is exactly why the rule above has you land your change on the newest minor template.

Finding contributions to work on

Looking at the existing issues is a great way to find something to contribute on. As our projects, by default, use the default GitHub issue labels (enhancement/bug/duplicate/help wanted/invalid/question/wontfix), looking at any 'help wanted' issues is a great place to start.

Code of Conduct

This project has adopted the Amazon Open Source Code of Conduct. For more information see the Code of Conduct FAQ or contact opensource-codeofconduct@amazon.com with any additional questions or comments.

Security issue notifications

If you discover a potential security issue in this project we ask that you notify AWS/Amazon Security via our vulnerability reporting page. Please do not create a public github issue.

Licensing

See the LICENSE file for our project's licensing. We will ask you to confirm the licensing of your contribution.