Skip to content

Commit

Permalink
Revert "updated to package files for: cuda/mathematica/matlab/py-pycu…
Browse files Browse the repository at this point in the history
…da/py-scipy"

This reverts commit d980a06.
  • Loading branch information
Felipe-Admin authored and adamjstewart committed Feb 15, 2023
1 parent d461502 commit 82e1f47
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 10 deletions.
1 change: 0 additions & 1 deletion var/spack/repos/builtin/packages/cuda/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,6 @@ def cmake_prefix_paths(self):

def setup_run_environment(self, env):
env.set("CUDA_HOME", self.prefix)
env.prepend_path("LD_LIBRARY_PATH", self.prefix.lib64)

def install(self, spec, prefix):
if os.path.exists("/tmp/cuda-installer.log"):
Expand Down
6 changes: 0 additions & 6 deletions var/spack/repos/builtin/packages/mathematica/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,6 @@ class Mathematica(Package):
expand=False,
)

version(
"13.1.0",
expand=False,
)


# Licensing
license_required = True
license_comment = "#"
Expand Down
13 changes: 13 additions & 0 deletions var/spack/repos/builtin/packages/matlab/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,16 @@ def install(self, spec, prefix):
# Full path required
input_file = join_path(self.stage.source_path, "spack_installer_input.txt")
subprocess.call(["./install", "-inputFile", input_file])

@run_after("install")
def post_install(self):
# Fix broken link
with working_dir(self.spec.prefix.bin.glnxa64):
os.unlink("libSDL2.so")
os.symlink("libSDL2-2.0.so.0.2.1", "libSDL2.so")

# Fix to random exceptions when changing display settings
# https://www.mathworks.com/matlabcentral/answers/373897-external-monitor-throws-java-exception
java_opts = os.path.join(self.spec.prefix.bin.glnxa64, "java.opts")
with open(java_opts, "w") as out:
out.write("-Dsun.java2d.xrender=false\n")
2 changes: 0 additions & 2 deletions var/spack/repos/builtin/packages/py-pycuda/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,8 @@ class PyPycuda(PythonPackage):
"""

homepage = "https://mathema.tician.de/software/pycuda/"
git = "https://github.com/inducer/pycuda.git"
pypi = "pycuda/pycuda-2019.1.2.tar.gz"

version("main", branch="main")
version("2021.1", sha256="ab87312d0fc349d9c17294a087bb9615cffcf966ad7b115f5b051008a48dd6ed")
version("2020.1", sha256="effa3b99b55af67f3afba9b0d1b64b4a0add4dd6a33bdd6786df1aa4cc8761a5")
version("2019.1.2", sha256="ada56ce98a41f9f95fe18809f38afbae473a5c62d346cfa126a2d5477f24cc8a")
Expand Down
2 changes: 1 addition & 1 deletion var/spack/repos/builtin/packages/py-scipy/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ class PyScipy(PythonPackage):
# https://github.com/mesonbuild/meson-python/pull/167
depends_on("py-build", when="@1.9:", type="build")

depends_on("[email protected]:", when="@1.10:", type="build")
depends_on("[email protected]", when="@1.10:", type="build")
depends_on("[email protected]:", when="@1.9.2:1.9", type="build")
depends_on("[email protected]:", when="@1.9.1", type="build")
depends_on("[email protected]", when="@1.9.0", type="build")
Expand Down

0 comments on commit 82e1f47

Please sign in to comment.