Skip to content

Commit

Permalink
Merge branch 'main' into tiny-ret
Browse files Browse the repository at this point in the history
  • Loading branch information
cheginit authored Feb 12, 2025
2 parents ffb3827 + 4e0d88e commit cca967b
Show file tree
Hide file tree
Showing 10 changed files with 60 additions and 168 deletions.
22 changes: 18 additions & 4 deletions .azure-pipelines/azure-pipelines-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,13 @@ jobs:
done
displayName: Manage disk space
- script: |
sudo fallocate -l 10GiB /swapfile || true
sudo chmod 600 /swapfile || true
sudo mkswap /swapfile || true
sudo swapon /swapfile || true
displayName: Create swap file
- script: |
# sudo pip install --upgrade pip
sudo pip install setuptools shyaml
Expand All @@ -98,7 +105,7 @@ jobs:
- publish: build_artifacts/linux-64/
artifact: conda_pkgs_linux_64_cuda118

- job: linux_64_cuda_120
- job: linux_64_cuda_126
dependsOn: linux_64
condition: and(not(eq(variables['Build.SourceBranch'], 'refs/heads/main')), eq(dependencies.linux_64.outputs['linux_64_build.NEED_CUDA'], '1'))
pool:
Expand All @@ -121,6 +128,13 @@ jobs:
done
displayName: Manage disk space
- script: |
sudo fallocate -l 10GiB /swapfile || true
sudo chmod 600 /swapfile || true
sudo mkswap /swapfile || true
sudo swapon /swapfile || true
displayName: Create swap file
- script: |
# sudo pip install --upgrade pip
sudo pip install setuptools shyaml
Expand All @@ -133,11 +147,11 @@ jobs:
mkdir -p build_artifacts/linux-64/
export CI=azure
export CONFIG=linux64_cuda120
export CONFIG=linux64_cuda126
export DOCKER_IMAGE=quay.io/condaforge/linux-anvil-x86_64:alma9
export AZURE=True
.scripts/run_docker_build.sh
displayName: Run docker build for CUDA 12.0
displayName: Run docker build for CUDA 12.6
- publish: build_artifacts/linux-64/
artifact: conda_pkgs_linux_64_cuda120
artifact: conda_pkgs_linux_64_cuda126
2 changes: 1 addition & 1 deletion .ci_support/linux64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ c_stdlib_version:
c_stdlib:
- sysroot
cdt_name:
- cos7
- conda
c_compiler:
- gcc
cxx_compiler:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux64_cuda118.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ c_stdlib:
c_stdlib_version:
- 2.17
cdt_name:
- cos7
- conda
target_platform:
- linux-64
channel_sources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@ go_compiler:
cgo_compiler:
- go-cgo
c_compiler_version:
- 12
- 13
cxx_compiler_version:
- 12
- 13
fortran_compiler_version:
- 12
- 13
c_stdlib:
- sysroot
c_stdlib_version:
- 2.17
cdt_name:
- cos7
- conda
target_platform:
- linux-64
channel_sources:
Expand All @@ -29,6 +29,6 @@ docker_image:
cuda_compiler:
- cuda-nvcc
cuda_compiler_version:
- 12.0
- 12.6
cuda_compiler_version_min:
- 11.8
11 changes: 10 additions & 1 deletion .github/workflows/scripts/create_feedstocks.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,20 @@
recipe_directory_name = "recipes"


def _test_and_raise_besides_file_not_exists(e: github.GithubException):
if isinstance(e, github.UnknownObjectException):
return
if e.status == 404 and "No object found" in e.data["message"]:
return
raise e


def _register_package_for_feedstock(feedstock, pkg_name, gh):
repo = gh.get_repo("conda-forge/feedstock-outputs")
try:
contents = repo.get_contents(_get_sharded_path(pkg_name))
except github.UnknownObjectException:
except github.GithubException as e:
_test_and_raise_besides_file_not_exists(e)
contents = None

if contents is None:
Expand Down
16 changes: 13 additions & 3 deletions .github/workflows/scripts/linter.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,15 @@
HERE = Path(__file__).parent
ROOT = (HERE / ".." / ".." / "..").absolute()


def _test_and_raise_besides_file_not_exists(e: github.GithubException):
if isinstance(e, github.UnknownObjectException):
return
if e.status == 404 and "No object found" in e.data["message"]:
return
raise e


def _lint_recipes(gh, pr):
lints = defaultdict(list)
hints = defaultdict(list)
Expand Down Expand Up @@ -124,7 +133,8 @@ def _lint_recipes(gh, pr):
break
else:
feedstock_exists = False
except github.UnknownObjectException:
except github.GithubException as e:
_test_and_raise_besides_file_not_exists(e)
feedstock_exists = False

if feedstock_exists and existing_recipe_name == recipe_name:
Expand All @@ -138,8 +148,8 @@ def _lint_recipes(gh, pr):
bio = gh.get_user("bioconda").get_repo("bioconda-recipes")
try:
bio.get_dir_contents(f"recipes/{recipe_name}")
except github.UnknownObjectException:
pass
except github.GithubException as e:
_test_and_raise_besides_file_not_exists(e)
else:
hints[fname].append(
"Recipe with the same name exists in bioconda: "
Expand Down
13 changes: 12 additions & 1 deletion .scripts/run_osx_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,20 @@ echo ""

( endgroup "Configuring conda" ) 2> /dev/null

# Set the target arch or auto detect it
if [[ -z "${TARGET_ARCH}" ]]; then
if [[ "$(uname -m)" == "arm64" ]]; then
TARGET_ARCH="arm64"
else
TARGET_ARCH="64"
fi
else
echo "TARGET_ARCH is set to ${TARGET_ARCH}"
fi

# We just want to build all of the recipes.
echo "Building all recipes"
python .ci_support/build_all.py
python .ci_support/build_all.py --arch ${TARGET_ARCH}

( startgroup "Inspecting artifacts" ) 2> /dev/null
# inspect_artifacts was only added in conda-forge-ci-setup 4.6.0; --all-packages in 4.9.3
Expand Down
46 changes: 0 additions & 46 deletions recipes/folktables/meta.yaml

This file was deleted.

55 changes: 0 additions & 55 deletions recipes/ptufile/meta.yaml

This file was deleted.

51 changes: 0 additions & 51 deletions recipes/synspace/recipe.yaml

This file was deleted.

0 comments on commit cca967b

Please sign in to comment.