Skip to content

Commit

Permalink
Squashed 'ultrasound' changes from 0349d03..b0c9240 (#1134)
Browse files Browse the repository at this point in the history
b0c9240 Merge pull request #195 from FaaSApps/next
56df2a0 Merge pull request #194 from ryanw/next
e0f6dd5 Update README.md
1b91b17 Update README.md
0fbe7c4 Merge pull request #193 from ryanw/next
527c04a  recovery mistakenlly change from 23 to 24
da4f111 Copyright © 2019–2024
9103a09 Update README.md
0a88cb9 Update README.md
e6d9056 Update README.md
b09044c Update README.md
e15c5d9 Update README.md
4109f28 Update README.md
2d50067 fix 22.2 TO 24.2  CR-1221872
72c4df4 Merge pull request #192 from yunleiz/doc2024
a5ab68b [doc] rm doc for CR-1220255
e88f6e3 Merge pull request #191 from yunleiz/doc2024
3284dd9 [doc] backup backgroud pages for CR-1220255
aeb66ff Merge pull request #190 from ryanw/next
d762c8d Merge branch 'FaaSApps:next' into next
4f4e5a3 fixing CR-1209088
7f92b57 Merge pull request #183 from RepoOps/update_vitis_json_0810
042a973 Merge pull request #187 from ryanw/next
f992308 remove third-part web links in sresources.rst
801b1e2 keep on setting larger time for test
3c5a824 fixed description.json issue
b7ec90a max_time_min from 300 to 470 for scanline in L2 and L3
9d3dca4 to fix CR-1216091
b94df90 Merge pull request #186 from RepoOps/update_makefile_0929
b8f2bc9 fix
7246c62 fix
61a3d8f update Makefile
5277cb8 Merge pull request #185 from jingt/CR-1203008
4742e39 remove error of CR-1203008
26a593f Merge pull request #180 from RepoOps/update_20240617-183706
a83081e clean vitis case description json
710bf2d updateJenkinsfile
011a328 change 2024.1_stable_latest to 2024.2_stable_latest

Co-authored-by: sdausr <[email protected]>
  • Loading branch information
2 people authored and GitHub Enterprise committed Nov 29, 2024
1 parent 223ffb0 commit 1db9f57
Show file tree
Hide file tree
Showing 21 changed files with 122 additions and 114 deletions.
40 changes: 14 additions & 26 deletions ultrasound/L1/README.md
Original file line number Diff line number Diff line change
@@ -1,19 +1,3 @@
# Copyright (C) 2019-2022, Xilinx, Inc.
# Copyright (C) 2022-2023, Advanced Micro Devices, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# vitis makefile-generator v2.0.8

## Ultrasound Library - Level 1 (L1)

The level 1 of Vitis Ultrasound Library contains the aie kernels. For more details information, please reference to L1 User Guide in the document for usage and design information.
Expand Down Expand Up @@ -453,16 +437,20 @@ This kernel create a vector and returns it `LEN` times.
- `out`: elements of the result of the operation (matrix) to be passed from the kernel.

## License
Copyright 2022 AMD, Inc.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
Licensed using the [Apache 2.0 license](https://www.apache.org/licenses/LICENSE-2.0).

Copyright (C) 2019-2022, Xilinx, Inc.
Copyright (C) 2022-2024, Advanced Micro Devices, Inc.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0
http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
24 changes: 14 additions & 10 deletions ultrasound/L2/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -117,16 +117,20 @@ This graph is used to compute the chordal version of the Catmull-Rom. It is call
- `C`: A vector with the result of the interpolation

## License
Copyright 2022 AMD, Inc.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
Licensed using the [Apache 2.0 license](https://www.apache.org/licenses/LICENSE-2.0).

http://www.apache.org/licenses/LICENSE-2.0
Copyright (C) 2019-2022, Xilinx, Inc.
Copyright (C) 2022-2024, Advanced Micro Devices, Inc.

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
36 changes: 20 additions & 16 deletions ultrasound/L2/tests/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
### Setup Environment
```bash
#!/bin/bash
# setup vitis_22.2 env
source <Vitis_install_path>/Vitis/2022.2/settings64.sh
# setup vitis_24.2 env
source <Vitis_install_path>/Vitis/2024.2/settings64.sh
source /opt/xilinx/xrt/setup.sh
export PLATFORM_REPO_PATHS=<path to platforms>
export PLATFORM=xilinx_vck190_base_202220_1
export PLATFORM=xilinx_vck190_base_202420_1
# set up your SYSROOT, ROOTFS and K_IMAGE PATH
export SYSROOT=<path to platforms>/sw/versal/xilinx-versal-common-v2022.2/sysroots/aarch64-xilinx-linux/
export ROOTFS=<path to platforms>/sw/versal/xilinx-versal-common-v2022.2/rootfs.ext4
export K_IMAGE=<path to platforms>/sw/versal/xilinx-versal-common-v2022.2/Image
export SYSROOT=<path to platforms>/sw/versal/xilinx-versal-common-v2024.2/sysroots/aarch64-xilinx-linux/
export ROOTFS=<path to platforms>/sw/versal/xilinx-versal-common-v2024.2/rootfs.ext4
export K_IMAGE=<path to platforms>/sw/versal/xilinx-versal-common-v2024.2/Image
```

### Run a L2 Example
Expand All @@ -27,16 +27,20 @@ make all TARGET=hw # build the entire program for hw_run
```

## License
Copyright 2022 AMD, Inc.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
Licensed using the [Apache 2.0 license](https://www.apache.org/licenses/LICENSE-2.0).

http://www.apache.org/licenses/LICENSE-2.0
Copyright (C) 2019-2022, Xilinx, Inc.
Copyright (C) 2022-2024, Advanced Micro Devices, Inc.

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
24 changes: 14 additions & 10 deletions ultrasound/L3/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -135,16 +135,20 @@ This beamformer is the one used to compute SA beamformation. As the graph is obt
- `C`: A vector with the result of the interpolation

## License
Copyright 2022 AMD, Inc.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
Licensed using the [Apache 2.0 license](https://www.apache.org/licenses/LICENSE-2.0).

http://www.apache.org/licenses/LICENSE-2.0
Copyright (C) 2019-2022, Xilinx, Inc.
Copyright (C) 2022-2024, Advanced Micro Devices, Inc.

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
36 changes: 20 additions & 16 deletions ultrasound/L3/tests/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
### Setup Environment
```bash
#!/bin/bash
# setup vitis_22.2 env
source <Vitis_install_path>/Vitis/2022.2/settings64.sh
# setup vitis_24.2 env
source <Vitis_install_path>/Vitis/2024.2/settings64.sh
source /opt/xilinx/xrt/setup.sh
export PLATFORM_REPO_PATHS=<path to platforms>
export PLATFORM=xilinx_vck190_base_202220_1
export PLATFORM=xilinx_vck190_base_202420_1
# set up your SYSROOT, ROOTFS and K_IMAGE PATH
export SYSROOT=<path to platforms>/sw/versal/xilinx-versal-common-v2022.2/sysroots/aarch64-xilinx-linux/
export ROOTFS=<path to platforms>/sw/versal/xilinx-versal-common-v2022.2/rootfs.ext4
export K_IMAGE=<path to platforms>/sw/versal/xilinx-versal-common-v2022.2/Image
export SYSROOT=<path to platforms>/sw/versal/xilinx-versal-common-v2024.2/sysroots/aarch64-xilinx-linux/
export ROOTFS=<path to platforms>/sw/versal/xilinx-versal-common-v2024.2/rootfs.ext4
export K_IMAGE=<path to platforms>/sw/versal/xilinx-versal-common-v2024.2/Image
```

### Run a L3 Example
Expand All @@ -27,16 +27,20 @@ make all TARGET=hw # build the entire program for hw_run
```

## License
Copyright 2022 AMD, Inc.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
Licensed using the [Apache 2.0 license](https://www.apache.org/licenses/LICENSE-2.0).

http://www.apache.org/licenses/LICENSE-2.0
Copyright (C) 2019-2022, Xilinx, Inc.
Copyright (C) 2022-2024, Advanced Micro Devices, Inc.

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
24 changes: 14 additions & 10 deletions ultrasound/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,20 @@ cd Vitis_Libraries/ultrasound
- [Run L3 testcase](L3/tests)

## License
Copyright 2022 AMD, Inc.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
Licensed using the [Apache 2.0 license](https://www.apache.org/licenses/LICENSE-2.0).

http://www.apache.org/licenses/LICENSE-2.0
Copyright (C) 2019-2022, Xilinx, Inc.
Copyright (C) 2022-2024, Advanced Micro Devices, Inc.

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
2 changes: 1 addition & 1 deletion ultrasound/docs/Doxyfile_L1
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Copyright (C) 2019-2022, Xilinx, Inc.
# Copyright (C) 2022-2023, Advanced Micro Devices, Inc.
# Copyright (C) 2022-2024, Advanced Micro Devices, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion ultrasound/docs/Doxyfile_L2
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Copyright (C) 2019-2022, Xilinx, Inc.
# Copyright (C) 2022-2023, Advanced Micro Devices, Inc.
# Copyright (C) 2022-2024, Advanced Micro Devices, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion ultrasound/docs/Doxyfile_L3
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Copyright (C) 2019-2022, Xilinx, Inc.
# Copyright (C) 2022-2023, Advanced Micro Devices, Inc.
# Copyright (C) 2022-2024, Advanced Micro Devices, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion ultrasound/docs/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Copyright (C) 2019-2022, Xilinx, Inc.
# Copyright (C) 2022-2023, Advanced Micro Devices, Inc.
# Copyright (C) 2022-2024, Advanced Micro Devices, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion ultrasound/docs/Makefile.sphinx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Minimal makefile for Sphinx documentation
# Copyright (C) 2019-2022, Xilinx, Inc.
# Copyright (C) 2022-2023, Advanced Micro Devices, Inc.
# Copyright (C) 2022-2024, Advanced Micro Devices, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
12 changes: 6 additions & 6 deletions ultrasound/docs/src/conf.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Copyright (C) 2019-2022, Xilinx, Inc.
# Copyright (C) 2022-2023, Advanced Micro Devices, Inc.
# Copyright (C) 2022-2024, Advanced Micro Devices, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -41,13 +41,13 @@
# -- Project information -----------------------------------------------------

project = 'Vitis Ultrasound Library'
copyright = '2023, Xilinx'
copyright = '2024, AMD'
author = 'Xilinx'

# The short X.Y version
version = '2023.1'
version = '2024.2'
# The full version, including alpha/beta/rc tags
release = 'v2023.1'
release = 'v2024.2'

# For bottom-left nav
try:
Expand All @@ -57,7 +57,7 @@

#html_context['display_lower_left'] = True
html_context['current_version'] = version
html_context['versions'] = ['2023.1']
html_context['versions'] = ['2024.2']

# -- General configuration ---------------------------------------------------

Expand Down Expand Up @@ -244,4 +244,4 @@ def setup(app):
'url_resolver': lambda url: github_doc_root + url,
'auto_toc_tree_section': 'Contents',
}, True)
app.add_transform(AutoStructify)
app.add_transform(AutoStructify)
2 changes: 1 addition & 1 deletion ultrasound/docs/src/features/details_L1.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
..
.. Copyright © 2019–2023 Advanced Micro Devices, Inc
.. Copyright © 2019–2024 Advanced Micro Devices, Inc
`Terms and Conditions <https://www.amd.com/en/corporate/copyright>`_.

Expand Down
2 changes: 1 addition & 1 deletion ultrasound/docs/src/features/details_L2.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
..
.. Copyright © 2019–2023 Advanced Micro Devices, Inc
.. Copyright © 2019–2024 Advanced Micro Devices, Inc
`Terms and Conditions <https://www.amd.com/en/corporate/copyright>`_.

Expand Down
2 changes: 1 addition & 1 deletion ultrasound/docs/src/features/details_L3.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
..
.. Copyright © 2019–2023 Advanced Micro Devices, Inc
.. Copyright © 2019–2024 Advanced Micro Devices, Inc
`Terms and Conditions <https://www.amd.com/en/corporate/copyright>`_.

Expand Down
2 changes: 1 addition & 1 deletion ultrasound/docs/src/features/features.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
..
.. Copyright © 2019–2023 Advanced Micro Devices, Inc
.. Copyright © 2019–2024 Advanced Micro Devices, Inc
`Terms and Conditions <https://www.amd.com/en/corporate/copyright>`_.

.. _features:
Expand Down
2 changes: 1 addition & 1 deletion ultrasound/docs/src/index.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
..
.. Copyright © 2019–2023 Advanced Micro Devices, Inc
.. Copyright © 2019–2024 Advanced Micro Devices, Inc
`Terms and Conditions <https://www.amd.com/en/corporate/copyright>`_.

Expand Down
4 changes: 2 additions & 2 deletions ultrasound/docs/src/introduction/overview.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
..
.. Copyright © 2019–2023 Advanced Micro Devices, Inc
.. Copyright © 2019–2024 Advanced Micro Devices, Inc
`Terms and Conditions <https://www.amd.com/en/corporate/copyright>`_.

Expand All @@ -14,7 +14,7 @@ Requirements
Software Platform
~~~~~~~~~~~~~~~~~

This library is designed to work with AMD Vitis |trade| 2023.2 and later, and therefore, inherits the system requirements of Vitis and XRT.
This library is designed to work with AMD Vitis |trade| 2024.2 and later, and therefore, inherits the system requirements of Vitis and XRT.

Supported operating systems are RHEL/CentOS 7.4, 7.5 and Ubuntu 16.04.4 LTS, 18.04.1 LTS.
With CentOS/RHEL 7.4 and 7.5, C++11/C++14 should be enabled via
Expand Down
2 changes: 1 addition & 1 deletion ultrasound/docs/src/introduction/release.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
..
.. Copyright © 2019–2023 Advanced Micro Devices, Inc
.. Copyright © 2019–2024 Advanced Micro Devices, Inc
`Terms and Conditions <https://www.amd.com/en/corporate/copyright>`_.

Expand Down
Loading

0 comments on commit 1db9f57

Please sign in to comment.