Skip to content

Commit

Permalink
Merge pull request #426 from macs3-project/feat/macs3/callvar
Browse files Browse the repository at this point in the history
Feature: MACS3 Call variants
  • Loading branch information
taoliu authored Dec 6, 2020
2 parents 38d7d8b + 5aedab9 commit 518447b
Show file tree
Hide file tree
Showing 70 changed files with 11,581 additions and 158 deletions.
10 changes: 4 additions & 6 deletions .github/workflows/build-and-test-MACS3-non-x64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,7 @@

name: CI non x64, python 3.7

on:
push:
branches: [ feat-macs3* ]
pull_request:
branches: [ feat-macs3* ]
on: [push, pull_request]

jobs:
build_job:
Expand All @@ -27,6 +23,8 @@ jobs:
steps:
- name: Checkout MACS
uses: actions/[email protected]
with:
submodules: 'true'
- name: Set up arch and run
uses: uraimo/[email protected]
id: build
Expand Down Expand Up @@ -57,7 +55,7 @@ jobs:
chown -R macs3:macs3 /MACS3
# install dependencies
apt-get update -qq -y
apt-get install -yq python3 python3-pip python3-setuptools python3-wheel procps
apt-get install -yq python3 python3-pip python3-setuptools python3-wheel procps zlib1g zlib1g-dev
run: |
echo `uname -a`
cd /home/macs3/
Expand Down
10 changes: 3 additions & 7 deletions .github/workflows/build-and-test-MACS3-x64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,7 @@

name: CI x64

on:
push:
branches: [ feat-macs3* ]
pull_request:
branches: [ feat-macs3* ]
on: [push, pull_request]

jobs:
build:
Expand All @@ -20,6 +16,8 @@ jobs:
steps:
- name: Checkout MACS
uses: actions/checkout@v2
with:
submodules: 'true'
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
Expand Down Expand Up @@ -61,5 +59,3 @@ jobs:
path: |
dist/*.tar.gz
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,6 @@ dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "MACS3/fermi-lite/lib"]
path = MACS3/fermi-lite/lib
url = https://github.com/simd-everywhere/simde/
10 changes: 0 additions & 10 deletions DOCKER/Dockerfile

This file was deleted.

16 changes: 0 additions & 16 deletions DOCKER/Dockerfile-slim

This file was deleted.

37 changes: 0 additions & 37 deletions DOCKER/README.md

This file was deleted.

Loading

0 comments on commit 518447b

Please sign in to comment.