Skip to content

Commit 1db9f57

Browse files
SDA USRsdausr
authored and
GitHub Enterprise
committed
Squashed 'ultrasound' changes from 0349d03..b0c9240 (#1134)
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]>
1 parent 223ffb0 commit 1db9f57

21 files changed

+122
-114
lines changed

‎ultrasound/L1/README.md

+14-26
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,3 @@
1-
# Copyright (C) 2019-2022, Xilinx, Inc.
2-
# Copyright (C) 2022-2023, Advanced Micro Devices, Inc.
3-
#
4-
# Licensed under the Apache License, Version 2.0 (the "License");
5-
# you may not use this file except in compliance with the License.
6-
# You may obtain a copy of the License at
7-
#
8-
# http://www.apache.org/licenses/LICENSE-2.0
9-
#
10-
# Unless required by applicable law or agreed to in writing, software
11-
# distributed under the License is distributed on an "AS IS" BASIS,
12-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
# See the License for the specific language governing permissions and
14-
# limitations under the License.
15-
# vitis makefile-generator v2.0.8
16-
171
## Ultrasound Library - Level 1 (L1)
182

193
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.
@@ -453,16 +437,20 @@ This kernel create a vector and returns it `LEN` times.
453437
- `out`: elements of the result of the operation (matrix) to be passed from the kernel.
454438

455439
## License
456-
Copyright 2022 AMD, Inc.
457440

458-
Licensed under the Apache License, Version 2.0 (the "License");
459-
you may not use this file except in compliance with the License.
460-
You may obtain a copy of the License at
441+
Licensed using the [Apache 2.0 license](https://www.apache.org/licenses/LICENSE-2.0).
442+
443+
Copyright (C) 2019-2022, Xilinx, Inc.
444+
Copyright (C) 2022-2024, Advanced Micro Devices, Inc.
445+
446+
Licensed under the Apache License, Version 2.0 (the "License");
447+
you may not use this file except in compliance with the License.
448+
You may obtain a copy of the License at
461449

462-
http://www.apache.org/licenses/LICENSE-2.0
450+
http://www.apache.org/licenses/LICENSE-2.0
463451

464-
Unless required by applicable law or agreed to in writing, software
465-
distributed under the License is distributed on an "AS IS" BASIS,
466-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
467-
See the License for the specific language governing permissions and
468-
limitations under the License.
452+
Unless required by applicable law or agreed to in writing, software
453+
distributed under the License is distributed on an "AS IS" BASIS,
454+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
455+
See the License for the specific language governing permissions and
456+
limitations under the License.

‎ultrasound/L2/README.md

+14-10
Original file line numberDiff line numberDiff line change
@@ -117,16 +117,20 @@ This graph is used to compute the chordal version of the Catmull-Rom. It is call
117117
- `C`: A vector with the result of the interpolation
118118

119119
## License
120-
Copyright 2022 AMD, Inc.
121120

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

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

128-
Unless required by applicable law or agreed to in writing, software
129-
distributed under the License is distributed on an "AS IS" BASIS,
130-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
131-
See the License for the specific language governing permissions and
132-
limitations under the License.
126+
Licensed under the Apache License, Version 2.0 (the "License");
127+
you may not use this file except in compliance with the License.
128+
You may obtain a copy of the License at
129+
130+
http://www.apache.org/licenses/LICENSE-2.0
131+
132+
Unless required by applicable law or agreed to in writing, software
133+
distributed under the License is distributed on an "AS IS" BASIS,
134+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
135+
See the License for the specific language governing permissions and
136+
limitations under the License.

‎ultrasound/L2/tests/README.md

+20-16
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
### Setup Environment
44
```bash
55
#!/bin/bash
6-
# setup vitis_22.2 env
7-
source <Vitis_install_path>/Vitis/2022.2/settings64.sh
6+
# setup vitis_24.2 env
7+
source <Vitis_install_path>/Vitis/2024.2/settings64.sh
88
source /opt/xilinx/xrt/setup.sh
99
export PLATFORM_REPO_PATHS=<path to platforms>
10-
export PLATFORM=xilinx_vck190_base_202220_1
10+
export PLATFORM=xilinx_vck190_base_202420_1
1111
# set up your SYSROOT, ROOTFS and K_IMAGE PATH
12-
export SYSROOT=<path to platforms>/sw/versal/xilinx-versal-common-v2022.2/sysroots/aarch64-xilinx-linux/
13-
export ROOTFS=<path to platforms>/sw/versal/xilinx-versal-common-v2022.2/rootfs.ext4
14-
export K_IMAGE=<path to platforms>/sw/versal/xilinx-versal-common-v2022.2/Image
12+
export SYSROOT=<path to platforms>/sw/versal/xilinx-versal-common-v2024.2/sysroots/aarch64-xilinx-linux/
13+
export ROOTFS=<path to platforms>/sw/versal/xilinx-versal-common-v2024.2/rootfs.ext4
14+
export K_IMAGE=<path to platforms>/sw/versal/xilinx-versal-common-v2024.2/Image
1515
```
1616

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

2929
## License
30-
Copyright 2022 AMD, Inc.
3130

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

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

38-
Unless required by applicable law or agreed to in writing, software
39-
distributed under the License is distributed on an "AS IS" BASIS,
40-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
41-
See the License for the specific language governing permissions and
42-
limitations under the License.
36+
Licensed under the Apache License, Version 2.0 (the "License");
37+
you may not use this file except in compliance with the License.
38+
You may obtain a copy of the License at
39+
40+
http://www.apache.org/licenses/LICENSE-2.0
41+
42+
Unless required by applicable law or agreed to in writing, software
43+
distributed under the License is distributed on an "AS IS" BASIS,
44+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
45+
See the License for the specific language governing permissions and
46+
limitations under the License.

‎ultrasound/L3/README.md

+14-10
Original file line numberDiff line numberDiff line change
@@ -135,16 +135,20 @@ This beamformer is the one used to compute SA beamformation. As the graph is obt
135135
- `C`: A vector with the result of the interpolation
136136

137137
## License
138-
Copyright 2022 AMD, Inc.
139138

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

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

146-
Unless required by applicable law or agreed to in writing, software
147-
distributed under the License is distributed on an "AS IS" BASIS,
148-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
149-
See the License for the specific language governing permissions and
150-
limitations under the License.
144+
Licensed under the Apache License, Version 2.0 (the "License");
145+
you may not use this file except in compliance with the License.
146+
You may obtain a copy of the License at
147+
148+
http://www.apache.org/licenses/LICENSE-2.0
149+
150+
Unless required by applicable law or agreed to in writing, software
151+
distributed under the License is distributed on an "AS IS" BASIS,
152+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
153+
See the License for the specific language governing permissions and
154+
limitations under the License.

‎ultrasound/L3/tests/README.md

+20-16
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
### Setup Environment
44
```bash
55
#!/bin/bash
6-
# setup vitis_22.2 env
7-
source <Vitis_install_path>/Vitis/2022.2/settings64.sh
6+
# setup vitis_24.2 env
7+
source <Vitis_install_path>/Vitis/2024.2/settings64.sh
88
source /opt/xilinx/xrt/setup.sh
99
export PLATFORM_REPO_PATHS=<path to platforms>
10-
export PLATFORM=xilinx_vck190_base_202220_1
10+
export PLATFORM=xilinx_vck190_base_202420_1
1111
# set up your SYSROOT, ROOTFS and K_IMAGE PATH
12-
export SYSROOT=<path to platforms>/sw/versal/xilinx-versal-common-v2022.2/sysroots/aarch64-xilinx-linux/
13-
export ROOTFS=<path to platforms>/sw/versal/xilinx-versal-common-v2022.2/rootfs.ext4
14-
export K_IMAGE=<path to platforms>/sw/versal/xilinx-versal-common-v2022.2/Image
12+
export SYSROOT=<path to platforms>/sw/versal/xilinx-versal-common-v2024.2/sysroots/aarch64-xilinx-linux/
13+
export ROOTFS=<path to platforms>/sw/versal/xilinx-versal-common-v2024.2/rootfs.ext4
14+
export K_IMAGE=<path to platforms>/sw/versal/xilinx-versal-common-v2024.2/Image
1515
```
1616

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

2929
## License
30-
Copyright 2022 AMD, Inc.
3130

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

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

38-
Unless required by applicable law or agreed to in writing, software
39-
distributed under the License is distributed on an "AS IS" BASIS,
40-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
41-
See the License for the specific language governing permissions and
42-
limitations under the License.
36+
Licensed under the Apache License, Version 2.0 (the "License");
37+
you may not use this file except in compliance with the License.
38+
You may obtain a copy of the License at
39+
40+
http://www.apache.org/licenses/LICENSE-2.0
41+
42+
Unless required by applicable law or agreed to in writing, software
43+
distributed under the License is distributed on an "AS IS" BASIS,
44+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
45+
See the License for the specific language governing permissions and
46+
limitations under the License.

‎ultrasound/README.md

+14-10
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,20 @@ cd Vitis_Libraries/ultrasound
2424
- [Run L3 testcase](L3/tests)
2525

2626
## License
27-
Copyright 2022 AMD, Inc.
2827

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

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

35-
Unless required by applicable law or agreed to in writing, software
36-
distributed under the License is distributed on an "AS IS" BASIS,
37-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
38-
See the License for the specific language governing permissions and
39-
limitations under the License.
33+
Licensed under the Apache License, Version 2.0 (the "License");
34+
you may not use this file except in compliance with the License.
35+
You may obtain a copy of the License at
36+
37+
http://www.apache.org/licenses/LICENSE-2.0
38+
39+
Unless required by applicable law or agreed to in writing, software
40+
distributed under the License is distributed on an "AS IS" BASIS,
41+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
42+
See the License for the specific language governing permissions and
43+
limitations under the License.

‎ultrasound/docs/Doxyfile_L1

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Copyright (C) 2019-2022, Xilinx, Inc.
3-
# Copyright (C) 2022-2023, Advanced Micro Devices, Inc.
3+
# Copyright (C) 2022-2024, Advanced Micro Devices, Inc.
44
#
55
# Licensed under the Apache License, Version 2.0 (the "License");
66
# you may not use this file except in compliance with the License.

‎ultrasound/docs/Doxyfile_L2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Copyright (C) 2019-2022, Xilinx, Inc.
3-
# Copyright (C) 2022-2023, Advanced Micro Devices, Inc.
3+
# Copyright (C) 2022-2024, Advanced Micro Devices, Inc.
44
#
55
# Licensed under the Apache License, Version 2.0 (the "License");
66
# you may not use this file except in compliance with the License.

‎ultrasound/docs/Doxyfile_L3

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Copyright (C) 2019-2022, Xilinx, Inc.
3-
# Copyright (C) 2022-2023, Advanced Micro Devices, Inc.
3+
# Copyright (C) 2022-2024, Advanced Micro Devices, Inc.
44
#
55
# Licensed under the Apache License, Version 2.0 (the "License");
66
# you may not use this file except in compliance with the License.

‎ultrasound/docs/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Copyright (C) 2019-2022, Xilinx, Inc.
3-
# Copyright (C) 2022-2023, Advanced Micro Devices, Inc.
3+
# Copyright (C) 2022-2024, Advanced Micro Devices, Inc.
44
#
55
# Licensed under the Apache License, Version 2.0 (the "License");
66
# you may not use this file except in compliance with the License.

‎ultrasound/docs/Makefile.sphinx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Minimal makefile for Sphinx documentation
22
# Copyright (C) 2019-2022, Xilinx, Inc.
3-
# Copyright (C) 2022-2023, Advanced Micro Devices, Inc.
3+
# Copyright (C) 2022-2024, Advanced Micro Devices, Inc.
44
#
55
# Licensed under the Apache License, Version 2.0 (the "License");
66
# you may not use this file except in compliance with the License.

‎ultrasound/docs/src/conf.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Copyright (C) 2019-2022, Xilinx, Inc.
3-
# Copyright (C) 2022-2023, Advanced Micro Devices, Inc.
3+
# Copyright (C) 2022-2024, Advanced Micro Devices, Inc.
44
#
55
# Licensed under the Apache License, Version 2.0 (the "License");
66
# you may not use this file except in compliance with the License.
@@ -41,13 +41,13 @@
4141
# -- Project information -----------------------------------------------------
4242

4343
project = 'Vitis Ultrasound Library'
44-
copyright = '2023, Xilinx'
44+
copyright = '2024, AMD'
4545
author = 'Xilinx'
4646

4747
# The short X.Y version
48-
version = '2023.1'
48+
version = '2024.2'
4949
# The full version, including alpha/beta/rc tags
50-
release = 'v2023.1'
50+
release = 'v2024.2'
5151

5252
# For bottom-left nav
5353
try:
@@ -57,7 +57,7 @@
5757

5858
#html_context['display_lower_left'] = True
5959
html_context['current_version'] = version
60-
html_context['versions'] = ['2023.1']
60+
html_context['versions'] = ['2024.2']
6161

6262
# -- General configuration ---------------------------------------------------
6363

@@ -244,4 +244,4 @@ def setup(app):
244244
'url_resolver': lambda url: github_doc_root + url,
245245
'auto_toc_tree_section': 'Contents',
246246
}, True)
247-
app.add_transform(AutoStructify)
247+
app.add_transform(AutoStructify)

‎ultrasound/docs/src/features/details_L1.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
..
22
3-
.. Copyright © 2019–2023 Advanced Micro Devices, Inc
3+
.. Copyright © 2019–2024 Advanced Micro Devices, Inc
44
55
`Terms and Conditions <https://www.amd.com/en/corporate/copyright>`_.
66

‎ultrasound/docs/src/features/details_L2.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
..
22
3-
.. Copyright © 2019–2023 Advanced Micro Devices, Inc
3+
.. Copyright © 2019–2024 Advanced Micro Devices, Inc
44
55
`Terms and Conditions <https://www.amd.com/en/corporate/copyright>`_.
66

‎ultrasound/docs/src/features/details_L3.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
..
22
3-
.. Copyright © 2019–2023 Advanced Micro Devices, Inc
3+
.. Copyright © 2019–2024 Advanced Micro Devices, Inc
44
55
`Terms and Conditions <https://www.amd.com/en/corporate/copyright>`_.
66

‎ultrasound/docs/src/features/features.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
..
2-
.. Copyright © 2019–2023 Advanced Micro Devices, Inc
2+
.. Copyright © 2019–2024 Advanced Micro Devices, Inc
33
`Terms and Conditions <https://www.amd.com/en/corporate/copyright>`_.
44

55
.. _features:

‎ultrasound/docs/src/index.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
..
2-
.. Copyright © 2019–2023 Advanced Micro Devices, Inc
2+
.. Copyright © 2019–2024 Advanced Micro Devices, Inc
33
44
`Terms and Conditions <https://www.amd.com/en/corporate/copyright>`_.
55

‎ultrasound/docs/src/introduction/overview.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
..
2-
.. Copyright © 2019–2023 Advanced Micro Devices, Inc
2+
.. Copyright © 2019–2024 Advanced Micro Devices, Inc
33
44
`Terms and Conditions <https://www.amd.com/en/corporate/copyright>`_.
55

@@ -14,7 +14,7 @@ Requirements
1414
Software Platform
1515
~~~~~~~~~~~~~~~~~
1616

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

1919
Supported operating systems are RHEL/CentOS 7.4, 7.5 and Ubuntu 16.04.4 LTS, 18.04.1 LTS.
2020
With CentOS/RHEL 7.4 and 7.5, C++11/C++14 should be enabled via

‎ultrasound/docs/src/introduction/release.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
..
2-
.. Copyright © 2019–2023 Advanced Micro Devices, Inc
2+
.. Copyright © 2019–2024 Advanced Micro Devices, Inc
33
44
`Terms and Conditions <https://www.amd.com/en/corporate/copyright>`_.
55

0 commit comments

Comments
 (0)