-
Notifications
You must be signed in to change notification settings - Fork 3
WIP: Fix cross dependent path #5
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
Draft
andreaskuster
wants to merge
31
commits into
master
Choose a base branch
from
fix_cross_dependent_path
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from 22 commits
Commits
Show all changes
31 commits
Select commit
Hold shift + click to select a range
5e2d0dc
Add minimal bug example.
andreaskuster f4763fc
Further reduce minimal example.
andreaskuster 89f87c3
Account for offset to center.
andreaskuster e1caeb1
Add fpga0 sdk env vars script
andreaskuster 34389ae
Add larger jacobi3d example
andreaskuster b1bac07
Add temporary fix.
andreaskuster d300e59
Merge remote-tracking branch 'origin/fix_cross_dependent_path' into f…
andreaskuster e83e4e3
Increase problem size.
andreaskuster 9da97a3
Add more complex example.
andreaskuster 74f8d21
Merge remote-tracking branch 'origin/fix_cross_dependent_path' into f…
andreaskuster 4000eca
Add minimal bug example.
andreaskuster f0e2e3b
Further reduce minimal example.
andreaskuster 8023480
Account for offset to center.
andreaskuster 0afabe0
Add temporary fix.
andreaskuster c4b83c5
Add fpga0 sdk env vars script
andreaskuster ab8c555
Add larger jacobi3d example
andreaskuster 47cc666
Add more complex example.
andreaskuster ed1dcb8
Increase problem size.
andreaskuster 97fe0fd
Merge remote-tracking branch 'origin/fix_cross_dependent_path' into f…
andreaskuster ff683e1
Make example more distinct to test function correctness.
andreaskuster 0e35d03
Add path inclusion for direct file execution.
andreaskuster fb9966c
Several readme extension
andreaskuster 67a6b93
Remove horidiff hotfix
andreaskuster 47dfc58
Update README.md
andreaskuster 6b737df
Update README.md
andreaskuster 6a27a5f
Move test config to default location
andreaskuster b9ae43b
Remove local env setup
andreaskuster 2a73675
Merge remote-tracking branch 'origin/fix_cross_dependent_path' into f…
andreaskuster 86ab704
Add extended horidiff example.
andreaskuster d442f68
Reduce min channel depth to 1024
andreaskuster 6a0cf1b
Update dace version
andreaskuster File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| { | ||
| "inputs": { | ||
| "inA": { | ||
| "data": "inA_float32.dat", | ||
| "data_type": "float32", | ||
| "input_dims": [ | ||
| "i" | ||
| ] | ||
| } | ||
| }, | ||
| "outputs": [ | ||
| "out" | ||
| ], | ||
| "dimensions": [ | ||
| 10, | ||
| 10, | ||
| 10 | ||
| ], | ||
| "vectorization": 1, | ||
| "program": { | ||
| "k0": { | ||
| "data_type": "float32", | ||
| "computation_string": "k0 = inA[i]", | ||
| "boundary_conditions": { | ||
| "inA": { | ||
| "type": "constant", | ||
| "value": 0.0 | ||
| } | ||
| } | ||
| }, | ||
| "k1": { | ||
| "data_type": "float32", | ||
| "computation_string": "k1 = inA[i]", | ||
| "boundary_conditions": { | ||
| "inA": { | ||
| "type": "constant", | ||
| "value": 0.0 | ||
| } | ||
| } | ||
| }, | ||
| "k2": { | ||
| "data_type": "float32", | ||
| "computation_string": "k2 = k1[i, j, k] + k0[i+1, j, k] + k0[i, j, k]", | ||
| "boundary_conditions": { | ||
| "k1": { | ||
| "type": "constant", | ||
| "value": 0.0 | ||
| }, | ||
| "k0": { | ||
| "type": "constant", | ||
| "value": 0.0 | ||
| } | ||
| } | ||
| }, | ||
| "k3": { | ||
| "data_type": "float32", | ||
| "computation_string": "k3 = k0[i, j, k] + k1[i+1, j+1, k+1] + k1[i, j, k]", | ||
| "boundary_conditions": { | ||
| "k0": { | ||
| "type": "constant", | ||
| "value": 0.0 | ||
| }, | ||
| "k1": { | ||
| "type": "constant", | ||
| "value": 0.0 | ||
| } | ||
| } | ||
| }, | ||
| "out": { | ||
| "data_type": "float32", | ||
| "computation_string": "out = k2[i, j, k] + k3[i, j, k]", | ||
| "boundary_conditions": { | ||
| "k2":{ | ||
| "type": "constant", | ||
| "value": 0.0 | ||
| }, | ||
| "k3": { | ||
| "type": "constant", | ||
| "value": 0.0 | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| { | ||
| "inputs": { | ||
| "inA": { | ||
| "data": "inA_float32.dat", | ||
| "data_type": "float32", | ||
| "input_dims": [ | ||
| "i" | ||
| ] | ||
| } | ||
| }, | ||
| "outputs": [ | ||
| "out" | ||
| ], | ||
| "dimensions": [ | ||
| 8, | ||
| 8, | ||
| 8 | ||
| ], | ||
| "vectorization": 1, | ||
| "program": { | ||
| "k0": { | ||
| "data_type": "float32", | ||
| "computation_string": "k0 = inA[i]", | ||
| "boundary_conditions": { | ||
| "inA": { | ||
| "type": "constant", | ||
| "value": 0.0 | ||
| } | ||
| } | ||
| }, | ||
| "k1": { | ||
| "data_type": "float32", | ||
| "computation_string": "k1 = inA[i]", | ||
| "boundary_conditions": { | ||
| "inA": { | ||
| "type": "constant", | ||
| "value": 0.0 | ||
| } | ||
| } | ||
| }, | ||
| "k2": { | ||
| "data_type": "float32", | ||
| "computation_string": "k2 = k1[i, j, k] + k0[i + 1, j, k] + k0[i, j, k]", | ||
| "boundary_conditions": { | ||
| "k1": { | ||
| "type": "constant", | ||
| "value": 0.0 | ||
| }, | ||
| "k0": { | ||
| "type": "constant", | ||
| "value": 0.0 | ||
| } | ||
| } | ||
| }, | ||
| "k3": { | ||
| "data_type": "float32", | ||
| "computation_string": "k3 = k0[i, j, k] + k4[i + 1, j, k] + k4[i, j, k]", | ||
| "boundary_conditions": { | ||
| "k0": { | ||
| "type": "constant", | ||
| "value": 0.0 | ||
| }, | ||
| "k4": { | ||
| "type": "constant", | ||
| "value": 0.0 | ||
| } | ||
| } | ||
| }, | ||
| "k4": { | ||
| "data_type": "float32", | ||
| "computation_string": "k4 = k1[i, j, k] + k1[i+1, j, k]", | ||
| "boundary_conditions": { | ||
| "k1": { | ||
| "type": "constant", | ||
| "value": 0.0 | ||
| } | ||
| } | ||
| }, | ||
| "out": { | ||
| "data_type": "float32", | ||
| "computation_string": "out = k2[i,j,k] + k3[i,j,k]", | ||
| "boundary_conditions": { | ||
| "k2":{ | ||
| "type": "constant", | ||
| "value": 0.0 | ||
| }, | ||
| "k3": { | ||
| "type": "constant", | ||
| "value": 0.0 | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| { | ||
| "inputs": { | ||
| "a": { | ||
| "data": "data/zeros_32x32x32_fp32.dat", | ||
| "data_type": "float32" | ||
| } | ||
| }, | ||
| "outputs": ["b"], | ||
| "dimensions": [512, 512, 512], | ||
| "program": { | ||
| "b": { | ||
| "computation_string": | ||
| "b = 0.16666666 * (a[i-1,j,k] + a[i+1,j,k] + a[i,j-1,k] + a[i,j+1,k] + a[i,j,k-1] + a[i,j,k+1])", | ||
| "boundary_conditions": { | ||
| "a": { | ||
| "type": "constant", | ||
| "value": 1.0 | ||
| } | ||
| }, | ||
| "data_type": | ||
| "float32" | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| # intel fpga | ||
| export INTELFPGAOCLSDKROOT=/opt/intelFPGA_pro/19.1/hld | ||
| export PATH=$INTELFPGAOCLSDKROOT/bin/:$PATH | ||
| export AOCL_BOARD_PACKAGE_ROOT=$INTELFPGAOCLSDKROOT/board/bittware_pcie/s10 | ||
| # /opt/intelFPGA_pro/19.4/hld/board/bittware_pcie/s10/board_env.xml | ||
| # /opt/intelFPGA_pro/19.4/hld/board/bittware_pcie/s10_hpc_default/board_env.xml | ||
| export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$AOCL_BOARD_PACKAGE_ROOT/linux64/lib | ||
|
|
||
| # xilinx fpga | ||
| export PATH=/opt/Xilinx/Vitis/2019.2/bin:/opt/Xilinx/Vitis_HLS/2019.2/bin:/opt/Xilinx/Vivado/2019.2/bin:$PATH | ||
| export XILINX_XRT=/opt/xilinx/xrt | ||
| export PATH=$XILINX_XRT/bin:$PATH | ||
| export LD_LIBRARY_PATH=$XILINX_XRT/lib:$LD_LIBRARY_PATH | ||
| export XILINXD_LICENSE_FILE=2100@sgv-license-01 | ||
| export LIBRARY_PATH=/usr/lib/x86_64-linux-gnu | ||
|
|
||
andreaskuster marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.