Merge pull request #684 from aws/rc/2.0.4

Release v2.0.4

Author: mjthimm

RELEASE_NOTES.md

@@ -1,15 +1,29 @@
 # F2 Developer Kit Release Notes
 
+## v2.0.4
+
+* Release of new F2 instance size, **f2.6xlarge**:
+
+| Instance Name     | FPGAs     | vCPUs     | FPGA Memory HBM / DDR4     | Instance Memory (GB)     | Local Storage (GiB)     | Network Bandwidth (Gbps)     | EBS Bandwidth (Gbps)     |
+| :---------------: | :-------: | :-------: | :------------------------: | :----------------------: | :---------------------: | :--------------------------: | :----------------------: |
+|  **f2.6xlarge**   |   **1**   |  **24**   |    **16 GiB / 64 GiB**     |         **256**          |       **1 x 950**       |          **12.5**            |         **7.5**          |
+|  f2.12xlarge      |   2       |  48       |    32 GiB / 128 GiB        |         512              |       2 x 950           |          25.0                |         15               |
+|  f2.48xlarge      |   8       |  192      |    128 GiB / 512 GiB       |         2048             |       8 x 950           |          100                 |         60               |
+
 ## v2.0.3
+
 * Releasing fpga_mgmt_examples to demonstrate how the FPGA Management C API is used to perform FPGA image slot load and clear operations.
 * Releasing the PacketGen Dual Instance Loopback example to the SDK Virtual Ethernet Application.
 * Fixing the clkgen CLIs to prevent the configuration of clock groups that were removed from the AWS_CLK_GEN IP in customer designs.
 
 ## v2.0.2
+
 Updates for initial release of ReadTheDocs documentation and to re-enable tests for XSIM.
 
 ## v2.0.1
+
 Updates to HDK, SDK, and Vitis documentation. Added check for XRT install to enable Vitis hardware emulation. XRT install can now be performed automatically by running a command presented during `vitis_setup.sh`.
 
 ## v2.0.0
+
 Initial release. F2 general-availability companion.

User_Guide_AWS_EC2_FPGA_Development_Kit.md

@@ -26,15 +26,15 @@ This documentation is relevant to F2 only. Therefore, it applies to all branches
 
 ### Instance Types
 
-![f2_instances](./shared/assets/instance_sizes.png)
+![f2_instances](./shared/assets/instance_sizes_20250110.png)
 
 ### 2nd Generation On-Cloud FPGA Accelerator Card
 
 ![f2_instances](./shared/assets/accel_card_specs_20250110.png)
 
 ### Comparison to F1
 
-![f2_f1_comp](./shared/assets/f2_f1_comp.png)
+![f2_f1_comp](./shared/assets/f2_f1_comp_20250110.png)
 
 ## AWS EC2 F2 FPGA Development Kit
 

docs-rtd/source/RELEASE_NOTES.rst

@@ -1,14 +1,59 @@
 F2 Developer Kit Release Notes
 ==============================
 
+.. _v204:
+
+v2.0.4
+------
+
+- Release of new F2 instance size, **f2.6xlarge**:
+
+.. list-table::
+  :header-rows: 1
+  :class: release-notes-instances
+  :widths: 12 6 6 24 12 12 12 12
+
+  * - Instance Name
+    - FPGAs
+    - vCPUs
+    - FPGA Memory HBM/DDR4
+    - Instance Memory (GB)
+    - Local Storage (GiB)
+    - Network Bandwidth (Gbps)
+    - EBS Bandwidth (Gbps)
+  * - **f2.6xlarge**
+    - **1**
+    - **24**
+    - **16 GiB / 64 GiB**
+    - **256**
+    - **1 x 950**
+    - **12.5**
+    - **7.5**
+  * - f2.12xlarge
+    - 2
+    - 48
+    - 32 GiB / 128 GiB
+    - 512
+    - 2 x 950
+    - 25
+    - 15
+  * - f2.48xlarge
+    - 8
+    - 192
+    - 128 GiB / 512 GiB
+    - 2048
+    - 8 x 950
+    - 100
+    - 60
+
 .. _v203:
 
 v2.0.3
 ------
 
-* Releasing fpga_mgmt_examples to demonstrate how the FPGA Management C API is used to perform FPGA image slot load and clear operations.
-* Releasing the PacketGen Dual Instance Loopback example to the SDK Virtual Ethernet Application.
-* Fixing the clkgen CLIs to prevent the configuration of clock groups that were removed from the AWS_CLK_GEN IP in customer designs.
+- Releasing fpga_mgmt_examples to demonstrate how the FPGA Management C API is used to perform FPGA image slot load and clear operations.
+- Releasing the PacketGen Dual Instance Loopback example to the SDK Virtual Ethernet Application.
+- Fixing the clkgen CLIs to prevent the configuration of clock groups that were removed from the AWS_CLK_GEN IP in customer designs.
 
 .. _v202:
 
@@ -25,7 +70,7 @@ v2.0.1
 Updates to HDK, SDK, and Vitis documentation.
 Added check for XRT install to enable Vitis hardware emulation.
 XRT install can now be performed automatically by running a
-command presented during `vitis_setup.sh`.
+command presented during ``vitis_setup.sh``.
 
 .. _v200:
 

docs-rtd/source/User_Guide_AWS_EC2_FPGA_Development_Kit.rst

@@ -328,6 +328,6 @@ FPGA Development Kit:
 - Connect to a custom CL design in FPGA through `Virtual
   JTAG <./hdk/docs/Virtual_JTAG_XVC.html>`__ to run hardware debug.
 
-.. |f2_instances| image:: ./_static/instance_sizes.png
+.. |f2_instances| image:: ./_static/instance_sizes_20250110.png
 .. |image1| image:: ./_static/accel_card_specs_20250110.png
-.. |f2_f1_comp| image:: ./_static/f2_f1_comp.png
+.. |f2_f1_comp| image:: ./_static/f2_f1_comp_20250110.png

docs-rtd/source/_static/f2_f1_comp_20250110.png

@@ -1 +1 @@
-RELEASE_VERSION=2.0.3
+RELEASE_VERSION=2.0.4

docs-rtd/source/_static/instance_sizes_20250110.png

@@ -357,7 +357,8 @@ function xrt_install_check {
         info_msg "#        Otherwise, please source your XRT setup script, 'setup.sh'           #"
         info_msg "#                     To reinstall, run 'install_xrt -f'!                     #"
         info_msg "###############################################################################"
-        return 2
+        source $xrt_path/setup.sh
+        return 0
     fi
     info_msg "###########################################################################"
     info_msg "#                       No XRT install detected!                          #"
@@ -384,8 +385,7 @@ function install_xrt {
         cd $AWS_FPGA_REPO_DIR && return 1
     fi
 
-    xrt_install_check
-    if [[ $? -eq 0 || $1 == "-f" || $1 == "--force" ]]; then
+    if [[ -z $(lsmod | grep "xocl") || $1 == "-f" || $1 == "--force" ]]; then
         if [[ -n $(echo $PATH | grep "cmake-3.3.2") ]]; then
             export PATH="/usr/bin:$PATH"
         fi