Skip to content

Update easyblock for AEDT 2025R1 #3644

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.

Sign up for GitHub

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

Merged
Micket merged 2 commits into from
Apr 15, 2025
Merged

Update easyblock for AEDT 2025R1 #3644

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b889ddd
Update easyblock for AEDT 2025R1
Mar 1, 2025
06f11e7
Fix function for `--module-only` and error message
Mar 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 58 additions & 21 deletions easybuild/easyblocks/a/aedt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,11 @@
"""
import os
import glob
import shutil
import tempfile

from easybuild.easyblocks.generic.packedbinary import PackedBinary
from easybuild.tools import LooseVersion
from easybuild.tools.build_log import EasyBuildError
from easybuild.tools.run import run_shell_cmd

Expand All @@ -45,31 +47,55 @@ def __init__(self, *args, **kwargs):
self.subdir = None

def _set_subdir(self):
idirs = glob.glob(os.path.join(self.installdir, 'v*/Linux*/'))

ver = LooseVersion(self.version)
if ver > LooseVersion("2024R1"):
pattern = 'v*/AnsysEM/'
else:
pattern = 'v*/Linux*/'
idirs = glob.glob(os.path.join(self.installdir, pattern))

if len(idirs) == 1:
self.subdir = os.path.relpath(idirs[0], self.installdir)
else:
raise EasyBuildError("Failed to locate single install subdirectory v*/Linux*/")
raise EasyBuildError(f"Failed to locate single install subdirectory {pattern}")

def install_step(self):
"""Install Ansys Electronics Desktop using its setup tool."""

ver = LooseVersion(self.version)
licserv = os.getenv('EB_AEDT_LICENSE_SERVER')
licport = os.getenv('EB_AEDT_LICENSE_SERVER_PORT')
licservs = licserv.split(',')
licservopt = ["-DLICENSE_SERVER%d=%s" % (i, serv) for i, serv in enumerate(licservs, 1)]
redundant = len(licservs) > 1
options = " ".join([
"-i silent",
"-DUSER_INSTALL_DIR=%s" % self.installdir,
"-DTMP_DIR=%s" % tempfile.TemporaryDirectory().name,
"-DLIBRARY_COMMON_INSTALL=1",
"-DSPECIFY_LIC_CFG=1",
"-DREDUNDANT_SERVERS=%d" % redundant,
*licservopt,
"-DSPECIFY_PORT=1",
"-DLICENSE_PORT=%s" % licport,
])
run_shell_cmd("./Linux/AnsysEM/Disk1/InstData/setup.exe %s" % options)

tempdir = tempfile.TemporaryDirectory()
if ver > LooseVersion("2024R1"):
installer = "./INSTALL"
cmd = " ".join([
installer,
"-silent",
"-install_dir %s" % self.installdir,
"-licserverinfo :%s:%s" % (licport, licserv),
"-usetempdir %s" % tempdir.name,
])
else:
installer = "./Linux/AnsysEM/Disk1/InstData/setup.exe"

cmd = " ".join([
installer,
"-i silent",
"-DUSER_INSTALL_DIR=%s" % self.installdir,
"-DTMP_DIR=%s" % tempdir.name,
"-DLIBRARY_COMMON_INSTALL=1",
"-DSPECIFY_LIC_CFG=1",
"-DREDUNDANT_SERVERS=%d" % redundant,
*licservopt,
"-DSPECIFY_PORT=1",
"-DLICENSE_PORT=%s" % licport,
])
run_shell_cmd(cmd)

def post_processing_step(self):
"""Disable OS check and set LC_ALL/LANG for runtime"""
Expand All @@ -95,14 +121,20 @@ def make_module_extra(self):
"""Extra module entries for Ansys Electronics Desktop."""

txt = super(EB_AEDT, self).make_module_extra()
version = self.version[2:].replace('R', '')
ver = LooseVersion(self.version)
short_ver = self.version[2:].replace('R', '')

if ver > LooseVersion("2024R1"):
pattern = 'v*/AnsysEM/'
else:
pattern = 'v*/Linux*/'
idirs = glob.glob(os.path.join(self.installdir, pattern))

idirs = glob.glob(os.path.join(self.installdir, 'v*/Linux*/'))
if len(idirs) == 1:
subdir = os.path.relpath(idirs[0], self.installdir)
# PyAEDT and other tools use the variable to find available AEDT versions
txt += self.module_generator.set_environment('ANSYSEM_ROOT%s' % version,
os.path.join(self.installdir, self.subdir))
txt += self.module_generator.set_environment('ANSYSEM_ROOT%s' % short_ver,
os.path.join(self.installdir, subdir))

txt += self.module_generator.prepend_paths('PATH', subdir)
txt += self.module_generator.prepend_paths('LD_LIBRARY_PATH', subdir)
Expand All @@ -120,7 +152,12 @@ def sanity_check_step(self):
'dirs': [self.subdir],
}

inpfile = os.path.join(self.subdir, 'Examples', 'RMxprt', 'lssm', 'sm-1.aedt')
custom_commands = ['ansysedt -ng -BatchSolve -Distributed %s' % inpfile]
# Since 2025R1, test examples cannot be directly found in builddir
# Copy a test example from installdir to a tempdir to prevent writing additional file into installdir
inpfilesrc = os.path.join(self.installdir, self.subdir, 'Examples', 'RMxprt', 'lssm', 'sm-1.aedt')
with tempfile.TemporaryDirectory() as tempdir:
shutil.copy(inpfilesrc, tempdir)
inpfile = os.path.join(tempdir, 'sm-1.aedt')
custom_commands = ['ansysedt -ng -batchsolve -Distributed -monitor %s' % inpfile]

super(EB_AEDT, self).sanity_check_step(custom_paths=custom_paths, custom_commands=custom_commands)
super(EB_AEDT, self).sanity_check_step(custom_paths=custom_paths, custom_commands=custom_commands)