Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update versions in workflow #7

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
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
31 changes: 18 additions & 13 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

name: Build artifacts

permissions: read-all

# Controls when the workflow will run
on:
# Triggers the workflow on push or pull request events but only for the main branch
Expand All @@ -18,30 +20,33 @@ jobs:
# This workflow contains a single job called "build"
build:
# The type of runner that the job will run on
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04

permissions:
contents: write

strategy:
matrix:
configuration: [py36, py37, py38, py39, appimage]
configuration: [py38, py39, py310, py311, appimage]
include:
- configuration: py36
python_version: 3.6
- configuration: py38
python_version: '3.8'
build_python: ON
build_appimage: OFF
- configuration: py37
python_version: 3.7
- configuration: py39
python_version: '3.9'
build_python: ON
build_appimage: OFF
- configuration: py38
python_version: 3.8
- configuration: py310
python_version: '3.10'
build_python: ON
build_appimage: OFF
- configuration: py39
python_version: 3.9
- configuration: py311
python_version: '3.11'
build_python: ON
build_appimage: OFF
- configuration: appimage
python_version: 3.9
python_version: 3.11
build_python: OFF
build_appimage: ON

Expand All @@ -54,7 +59,7 @@ jobs:
# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

- name: Download model files
run: |
Expand All @@ -66,7 +71,7 @@ jobs:
uses: ./.github/actions/docker-action

- name: Upload artifacts
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
with:
name: artifact_${{ matrix.configuration }}
path: |
Expand Down
15 changes: 7 additions & 8 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:18.04
FROM ubuntu:22.04@sha256:adbb90115a21969d2fe6fa7f9af4253e16d45f8d4c1e930182610c4731962658

# Miniconda requires bash as the default shell.
SHELL ["/bin/bash", "-c"]
Expand All @@ -15,13 +15,12 @@ RUN apt-get update && apt-get install -y \
xorg-dev \
&& rm -rf /var/lib/apt/lists/*

# Miniconda
ENV PATH="/root/miniconda3/bin:${PATH}"
RUN wget -q https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh \
&& bash Miniconda3-latest-Linux-x86_64.sh -b \
&& rm Miniconda3-latest-Linux-x86_64.sh \
&& conda --version

# Miniforge
ENV PATH="/root/miniforge3/bin:${PATH}"
RUN wget "https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-$(uname)-$(uname -m).sh" \
&& bash Miniforge3-$(uname)-$(uname -m).sh -b \
&& rm -v Miniforge3*.sh \
&& conda --version

COPY docker_entrypoint.sh /docker_entrypoint.sh

Expand Down
2 changes: 1 addition & 1 deletion cmake/external_deps.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ ExternalProject_Add(
ext_open3d
PREFIX open3d
GIT_REPOSITORY https://github.com/isl-org/Open3D.git
GIT_TAG v0.14.1
GIT_TAG v0.18.0
GIT_SHALLOW YES
UPDATE_COMMAND ""
CMAKE_ARGS
Expand Down
1 change: 1 addition & 0 deletions cpp/lib/asr.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include <torch/script.h>

#include <stdexcept>
#include <stddef.h>

#include "contouring.h"
#include "grid.h"
Expand Down
1 change: 1 addition & 0 deletions cpp/lib/contouring.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

#include <cstdint>
#include <vector>
#include <stddef.h>

#include "asr_config.h"

Expand Down
1 change: 1 addition & 0 deletions cpp/lib/octree.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
//
#pragma once

#include <stddef.h>
#include "asr_config.h"
#include "eigen.h"
#include "octreebase.h"
Expand Down
1 change: 1 addition & 0 deletions cpp/lib/postprocess.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#include <iostream>
#include <numeric>
#include <unordered_set>
#include <stddef.h>

#include "nested_vector.h"

Expand Down
1 change: 1 addition & 0 deletions cpp/lib/preprocess.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
//
#pragma once
#include <vector>
#include <stddef.h>

#include "asr_config.h"

Expand Down
4 changes: 2 additions & 2 deletions docker_entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ conda create -y -n asr python=$PYTHON_VERSION
source activate asr
conda install -y cmake

python -m pip install torch==1.8.2+cpu -f https://download.pytorch.org/whl/lts/1.8/torch_lts.html
python -m pip install open3d==0.14.1 zstandard msgpack msgpack-numpy
python -m pip install torch==1.13.1+cpu --extra-index-url https://download.pytorch.org/whl/cpu
python -m pip install open3d==0.18.0 zstandard msgpack msgpack-numpy

pushd datasets
python create_t10k_msgpacks.py --attribution_file_only
Expand Down
Loading