Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions .github/actions/setup-python-tools/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,19 @@ runs:
python-version: '3.9.13'

# Step 2: Install pip-tools, which is used to generate hashed requirements.
# Note: pip 25.1 has a bug that causes pip-tools to fail with the following error:
# Note_1: pip 25.1 has a bug that causes pip-tools to fail with the following error:
# File ".../python3.9/site-packages/piptools/repositories/pypi.py", line 452, in allow_all_wheels
# self.finder.find_all_candidates.cache_clear()
# AttributeError: 'function' object has no attribute 'cache_clear'
# Thus, we fix the pip version to 25.0.1.
# Note_2: Even though some wheels are garded behind conditionals i.e. only use this if platform = linux;
Copy link
Collaborator

Choose a reason for hiding this comment

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

nit: guarded*

# pip-tools 7.5.0 fails with the following error:
# pip._internal.exceptions.UnsupportedWheel: pyg_lib-0.4....linux_x86_64.whl is not a supported wheel on this platform.
# Thus, we fix the pip version to 25.0.1 and pip-tools version to 7.4.1.
- name: Install pip-tools
shell: bash
run: |
python -m pip install "pip==25.0.1"
pip install pip-tools
python -m pip install "pip-tools==7.4.1"

# Step 3: Set up Gcloud AUTH using Workload Identity Federation
# See following for context: https://cloud.google.com/blog/products/identity-security/enabling-keyless-authentication-from-github-actions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ substitutions:
options:
logging: CLOUD_LOGGING_ONLY
steps:
- name: us-central1-docker.pkg.dev/external-snap-ci-github-gigl/gigl-base-images/gigl-builder:edd3b64401d2ee257f9ee07c84ac4edf6381e78a.35.1
- name: us-central1-docker.pkg.dev/external-snap-ci-github-gigl/gigl-base-images/gigl-builder:ea5cafee34c508ea98b3e5a7cf69e4e226cd0247.37.1
entrypoint: /bin/bash
args:
- -c
Expand Down
5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@ include dep_vars.env

SHELL := /bin/bash
CONDA_ENV_NAME=gnn
# Ensure that python, pip, and pip-tools versions are consistent with the ones in:
# .github/actions/setup-python-tools/action.yml
PYTHON_VERSION=3.9
PIP_VERSION=25.0.1
PIP_TOOLS_VERSION=7.4.1
DATE:=$(shell /bin/date "+%Y%m%d_%H%M")

# GIT HASH, or empty string if not in a git repo.
Expand Down Expand Up @@ -46,7 +49,7 @@ get_ver_hash:
$(eval GIT_COMMIT=$(shell git log -1 --pretty=format:"%H"))

initialize_environment:
conda create -y --override-channels --channel conda-forge --name ${CONDA_ENV_NAME} python=${PYTHON_VERSION} pip=${PIP_VERSION} pip-tools
conda create -y --override-channels --channel conda-forge --name ${CONDA_ENV_NAME} python=${PYTHON_VERSION} pip=${PIP_VERSION} pip-tools=${PIP_TOOLS_VERSION}
@echo "If conda environment was successfully installed, ensure to activate it and run \`make install_dev_deps\` or \`make install_deps\` to complete setup"

clean_environment:
Expand Down
6 changes: 3 additions & 3 deletions dep_vars.env
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Note this file only supports static key value pairs so it can be loaded by make, bash, python, and sbt without any additional parsing.
DOCKER_LATEST_BASE_CUDA_IMAGE_NAME_WITH_TAG=us-central1-docker.pkg.dev/external-snap-ci-github-gigl/public-gigl/gigl-cuda-base:edd3b64401d2ee257f9ee07c84ac4edf6381e78a.35.1
DOCKER_LATEST_BASE_CPU_IMAGE_NAME_WITH_TAG=us-central1-docker.pkg.dev/external-snap-ci-github-gigl/public-gigl/gigl-cpu-base:edd3b64401d2ee257f9ee07c84ac4edf6381e78a.35.1
DOCKER_LATEST_BASE_DATAFLOW_IMAGE_NAME_WITH_TAG=us-central1-docker.pkg.dev/external-snap-ci-github-gigl/public-gigl/gigl-dataflow-base:edd3b64401d2ee257f9ee07c84ac4edf6381e78a.35.1
DOCKER_LATEST_BASE_CUDA_IMAGE_NAME_WITH_TAG=us-central1-docker.pkg.dev/external-snap-ci-github-gigl/public-gigl/gigl-cuda-base:ea5cafee34c508ea98b3e5a7cf69e4e226cd0247.37.1
DOCKER_LATEST_BASE_CPU_IMAGE_NAME_WITH_TAG=us-central1-docker.pkg.dev/external-snap-ci-github-gigl/public-gigl/gigl-cpu-base:ea5cafee34c508ea98b3e5a7cf69e4e226cd0247.37.1
DOCKER_LATEST_BASE_DATAFLOW_IMAGE_NAME_WITH_TAG=us-central1-docker.pkg.dev/external-snap-ci-github-gigl/public-gigl/gigl-dataflow-base:ea5cafee34c508ea98b3e5a7cf69e4e226cd0247.37.1

DEFAULT_GIGL_RELEASE_SRC_IMAGE_CUDA=us-central1-docker.pkg.dev/external-snap-ci-github-gigl/public-gigl/src-cuda:0.0.9
DEFAULT_GIGL_RELEASE_SRC_IMAGE_CPU=us-central1-docker.pkg.dev/external-snap-ci-github-gigl/public-gigl/src-cpu:0.0.9
Expand Down
407 changes: 406 additions & 1 deletion requirements/darwin_arm64_requirements_unified.txt

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion requirements/dev_darwin_arm64_requirements_unified.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1801,7 +1801,9 @@ objsize==0.7.1 \
omegaconf==2.3.0 \
--hash=sha256:7b4df175cdb08ba400f45cae3bdcae7ba8365db4d165fc65fd04b050ab63b46b \
--hash=sha256:d5d4b6d29955cc50ad50c46dc269bcd92c6e00f5f90d23ab5fee7bfca4ba4cc7
# via hydra-core
# via
# gigl (python/pyproject.toml)
# hydra-core
opentelemetry-api==1.31.1 \
--hash=sha256:137ad4b64215f02b3000a0292e077641c8611aab636414632a9b9068593b7e91 \
--hash=sha256:1511a3f470c9c8a32eeea68d4ea37835880c0eed09dd1a0187acc8b1301da0a1
Expand Down
4 changes: 3 additions & 1 deletion requirements/dev_linux_cpu_requirements_unified.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2003,7 +2003,9 @@ objsize==0.7.1 \
omegaconf==2.3.0 \
--hash=sha256:7b4df175cdb08ba400f45cae3bdcae7ba8365db4d165fc65fd04b050ab63b46b \
--hash=sha256:d5d4b6d29955cc50ad50c46dc269bcd92c6e00f5f90d23ab5fee7bfca4ba4cc7
# via hydra-core
# via
# gigl (python/pyproject.toml)
# hydra-core
opentelemetry-api==1.31.1 \
--hash=sha256:137ad4b64215f02b3000a0292e077641c8611aab636414632a9b9068593b7e91 \
--hash=sha256:1511a3f470c9c8a32eeea68d4ea37835880c0eed09dd1a0187acc8b1301da0a1
Expand Down
4 changes: 3 additions & 1 deletion requirements/dev_linux_cuda_requirements_unified.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1993,7 +1993,9 @@ objsize==0.7.1 \
omegaconf==2.3.0 \
--hash=sha256:7b4df175cdb08ba400f45cae3bdcae7ba8365db4d165fc65fd04b050ab63b46b \
--hash=sha256:d5d4b6d29955cc50ad50c46dc269bcd92c6e00f5f90d23ab5fee7bfca4ba4cc7
# via hydra-core
# via
# gigl (python/pyproject.toml)
# hydra-core
opentelemetry-api==1.31.1 \
--hash=sha256:137ad4b64215f02b3000a0292e077641c8611aab636414632a9b9068593b7e91 \
--hash=sha256:1511a3f470c9c8a32eeea68d4ea37835880c0eed09dd1a0187acc8b1301da0a1
Expand Down
Loading