Skip to content

Commit 19ffa7a

Browse files
committed
Squashed 'lib/foldseek/' changes from fbf7df07..19800e92
19800e92 change modelNameMode to auto b2e48ff8 Merge pull request #437 from sooyoung-cha/master 77ca7109 Merge branch 'master' of https://github.com/steineggerlab/foldseek 97f9fd57 Fix sort 7e800905 Merge commit 'b0815f7d045b99edf726d8d0bc36d00be3d10870' b0815f7d Squashed 'lib/mmseqs/' changes from e49a41dd06..eddbd48a40 4890860a Merge commit 'ab7771690bac41376c262236e36db071712f95f0' ab777169 Squashed 'lib/foldcomp/' changes from 881ae5aab..60a79b1f6 50011e26 Add target multi-threaded tmalign c15be6ee update LocalParameters 2062c282 made model name mode parameter ffdb9b9b lookup and header name is same git-subtree-dir: lib/foldseek git-subtree-split: 19800e921de4dcadd646feac40d83b4114137515
1 parent 02487f2 commit 19ffa7a

File tree

2,712 files changed

+4718
-22931
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,712 files changed

+4718
-22931
lines changed

.github/foldmason_logo.png

-682 KB
Binary file not shown.

.github/html.gif

-5.81 MB
Binary file not shown.
File renamed without changes.

.github/workflows/build.yml

Lines changed: 0 additions & 265 deletions
This file was deleted.

.github/workflows/docker.yml

Lines changed: 63 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,19 @@ name: Create and publish a Docker image
33
on:
44
push:
55
branches:
6-
- "main"
6+
- "master"
77
release:
88
types: [published]
99
workflow_dispatch:
1010
inputs:
1111
tag:
1212
required: true
1313
type: string
14+
description: "Docker tag"
1415
latest:
1516
default: false
1617
type: boolean
18+
description: "Mark as latest"
1719

1820

1921
env:
@@ -45,7 +47,7 @@ jobs:
4547

4648
- name: Extract metadata (tags, labels) for Docker
4749
id: meta
48-
uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
50+
uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81
4951
with:
5052
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
5153

@@ -77,4 +79,63 @@ jobs:
7779
${{ steps.dispatch_tag.outputs.tag }}
7880
${{ steps.dispatch_tag.outputs.latest }}
7981
labels: ${{ steps.meta.outputs.labels }}
82+
build-and-push-gpu-image:
83+
runs-on: ubuntu-latest
84+
permissions:
85+
contents: read
86+
packages: write
87+
steps:
88+
- name: Checkout repository
89+
uses: actions/checkout@v3
90+
91+
# - name: Set up QEMU
92+
# uses: docker/setup-qemu-action@v2
93+
94+
- name: Set up Docker Buildx
95+
uses: docker/setup-buildx-action@v2
96+
97+
- name: Log in to the Container registry
98+
uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
99+
with:
100+
registry: ${{ env.REGISTRY }}
101+
username: ${{ github.actor }}
102+
password: ${{ secrets.GITHUB_TOKEN }}
103+
104+
- name: Extract metadata (tags, labels) for Docker
105+
id: meta
106+
uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81
107+
with:
108+
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
109+
flavor: |
110+
suffix=-cuda12,onlatest=true
111+
112+
- name: Tag for workflow_dispatch
113+
id: dispatch_tag
114+
run: |
115+
if [ x"$TAG" != x"" ];then
116+
echo "::set-output name=tag::${FULL_TAG}"
117+
fi
118+
if [ x"$LATEST" = x"true" ]; then
119+
echo "::set-output name=latest::${LATEST_TAG}"
120+
fi
121+
env:
122+
FULL_TAG: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.event.inputs.tag }}
123+
LATEST_TAG: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
124+
TAG: ${{ github.event.inputs.tag }}
125+
LATEST: ${{ github.event.inputs.latest }}
80126

127+
- name: Build and push Docker image
128+
uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
129+
with:
130+
context: .
131+
platforms: linux/amd64
132+
push: true
133+
cache-from: type=gha
134+
cache-to: type=gha,mode=max
135+
build-args: |
136+
GPU=1
137+
tags: |
138+
${{ steps.meta.outputs.tags }}
139+
${{ steps.dispatch_tag.outputs.tag }}
140+
${{ steps.dispatch_tag.outputs.latest }}
141+
labels: ${{ steps.meta.outputs.labels }}

.github/workflows/mac-arm64.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,20 @@ on:
88

99
jobs:
1010
build:
11-
runs-on: [self-hosted, macOS, ARM64]
11+
runs-on: macos-latest
1212
steps:
1313
- uses: actions/checkout@v3
1414
with:
1515
submodules: true
1616

17+
- name: Dependencies
18+
run: |
19+
brew install -f --overwrite cmake libomp rustup
20+
rustup-init --profile minimal -q -y
21+
1722
- name: Build
1823
run: |
1924
mkdir -p build
20-
rustup update
2125
cd build
2226
LIBOMP=$(brew --prefix libomp)
2327
cmake \

.gitmodules

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
[submodule "util/regression"]
2-
path = lib/foldseek/lib/mmseqs/util/regression
2+
path = lib/mmseqs/util/regression
33
url = https://github.com/soedinglab/MMseqs2-Regression.git
44
update = none
5+
[submodule "lib/prostt5/ggml/src/ggml-kompute/kompute"]
6+
path = lib/prostt5/ggml/src/ggml-kompute/kompute
7+
url =
8+
update = none
59
[submodule "regression"]
6-
path = lib/foldseek/regression
10+
path = regression
711
url = https://github.com/steineggerlab/foldseek-regression
8-
update = none

0 commit comments

Comments
 (0)