Skip to content

Commit

Permalink
hls/xls: disable conda-forge
Browse files Browse the repository at this point in the history
- remove conda-forge requirements
- install bazel using bazelisk
- remove obsolete patches
- strip python host dependencies and patches (not used by binary rules)

hls/xls: add compiler deps

github/workflows/Build: re-enable xls

hls/xls: remove requirements

hls/xls: add proto_to_dslx_main

hls/xls: re-enable llvm toolchain

hls/xls: build proto_to_dslx_main

hls/xls: remove bazel alias
  • Loading branch information
proppy committed Aug 19, 2022
1 parent c20af6b commit c8d203d
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 352 deletions.
1 change: 0 additions & 1 deletion .github/workflows/Build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -769,7 +769,6 @@ jobs:
env:
PACKAGE: "hls/xls"
OS_NAME: "linux"
SKIP: "true"
steps:
- uses: actions/checkout@v3
- uses: ./ci
42 changes: 0 additions & 42 deletions hls/xls/add-dist-rule.patch

This file was deleted.

10 changes: 7 additions & 3 deletions hls/xls/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,18 @@

set -ex

bazel build -c opt \
chmod +x $SRC_DIR/bazelisk-linux-amd64
$SRC_DIR/bazelisk-linux-amd64 build -c opt \
--extra_toolchains=@llvm_toolchain//:cc-toolchain-x86_64-linux \
//xls/dslx:interpreter_main \
//xls/dslx:ir_converter_main \
//xls/tools:opt_main \
//xls/tools:codegen_main
//xls/tools:codegen_main \
//xls/tools:proto_to_dslx_main

mkdir -p $PREFIX/bin/
cp bazel-bin/xls/dslx/interpreter_main \
bazel-bin/xls/dslx/ir_converter_main \
bazel-bin/xls/tools/opt_main \
bazel-bin/xls/tools/codegen_main $PREFIX/bin/
bazel-bin/xls/tools/codegen_main \
bazel-bin/xls/tools/proto_to_dslx_main $PREFIX/bin/
2 changes: 0 additions & 2 deletions hls/xls/condarc

This file was deleted.

23 changes: 3 additions & 20 deletions hls/xls/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ source:
- git_url: https://github.com/google/xls.git
git_rev: main
patches:
- skip-python-requirements.patch
- use-llvm-toolchain.patch

- use-llvm-toolchain.patch
- url: https://github.com/bazelbuild/bazelisk/releases/download/v1.12.0/bazelisk-linux-amd64
sha256: 6b0bcb2ea15bca16fffabe6fda75803440375354c085480fe361d2cbf32501db
build:
# number: 202202082028
number: {{ environ.get('DATE_NUM') }}
Expand All @@ -20,23 +20,6 @@ build:
script_env:
- CI

requirements:
build:
- bazel
host:
- python
- pip
- protobuf
- pycparser 2.19
- Flask 1.1.2
- Jinja2 2.11.3
- werkzeug 1.0.1
- itsdangerous 1.1.0
- MarkupSafe 2.0
- click 7.1.2
- numpy >=1.19.5,<=1.20.0
- scipy >=1.5.4,<=1.6.0

test:
commands:
- interpreter_main --version
Expand Down
249 changes: 0 additions & 249 deletions hls/xls/skip-python-requirements.patch

This file was deleted.

Loading

0 comments on commit c8d203d

Please sign in to comment.