Browse Source

Fix issues related to windows and linux.

main
Bill Ladwig 7 years ago
parent
commit
e745270da4
  1. 2
      conda_recipe/bld.bat
  2. 2
      conda_recipe/build.sh
  3. BIN
      fortran/build_help/sizes
  4. 3
      fortran/build_help/sub_sizes.py

2
conda_recipe/bld.bat

@ -1,4 +1,4 @@
cd ..\fortran\build_help cd fortran\build_help
CALL gfortran -o sizes -fopenmp omp_sizes.f90 CALL gfortran -o sizes -fopenmp omp_sizes.f90
CALL python sub_sizes.py CALL python sub_sizes.py

2
conda_recipe/build.sh

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
cd ../fortran/build_help cd fortran/build_help
gfortran -o sizes -fopenmp omp_sizes.f90 gfortran -o sizes -fopenmp omp_sizes.f90
python sub_sizes.py python sub_sizes.py

BIN
fortran/build_help/sizes

Binary file not shown.

3
fortran/build_help/sub_sizes.py

@ -5,7 +5,10 @@ from string import Template
def main(): def main():
print ("Running sub_sizes") print ("Running sub_sizes")
try:
result = subprocess.check_output(["./sizes"]) result = subprocess.check_output(["./sizes"])
except WindowsError:
result = subprocess.check_output(["sizes.exe"])
split_result = result.split() split_result = result.split()

Loading…
Cancel
Save