[yt-svn] commit/yt: 3 new changesets

commits-noreply at bitbucket.org commits-noreply at bitbucket.org
Mon Oct 5 11:16:21 PDT 2015


3 new commits in yt:

https://bitbucket.org/yt_analysis/yt/commits/6694235f2b1c/
Changeset:   6694235f2b1c
Branch:      yt
User:        atmyers
Date:        2015-09-24 20:16:08+00:00
Summary:     disable openmp if an OSError is encountered
Affected #:  1 file

diff -r d70d717bcd116621c0d30808a495b905a4046f58 -r 6694235f2b1c292a5046258d4332b718cad78a04 yt/utilities/lib/setup.py
--- a/yt/utilities/lib/setup.py
+++ b/yt/utilities/lib/setup.py
@@ -37,6 +37,8 @@
 
         # Clean up
         file.close()
+    except OSError:
+        return False
     finally:
         os.chdir(curdir)
         shutil.rmtree(tmpdir)


https://bitbucket.org/yt_analysis/yt/commits/97662cd27b35/
Changeset:   97662cd27b35
Branch:      yt
User:        atmyers
Date:        2015-09-24 20:45:38+00:00
Summary:     also attempt to split the contents of CC, in case people are using ccache
Affected #:  1 file

diff -r 6694235f2b1c292a5046258d4332b718cad78a04 -r 97662cd27b3580038bfa025d139cd57c77c1c211 yt/utilities/lib/setup.py
--- a/yt/utilities/lib/setup.py
+++ b/yt/utilities/lib/setup.py
@@ -17,6 +17,7 @@
 
         # Get compiler invocation
         compiler = os.getenv('CC', 'cc')
+        compiler = compiler.split(' ')
 
         # Attempt to compile a test script.
         # See http://openmp.org/wp/openmp-compilers/
@@ -32,7 +33,7 @@
             )
         file.flush()
         with open(os.devnull, 'w') as fnull:
-            exit_code = subprocess.call([compiler, '-fopenmp', filename],
+            exit_code = subprocess.call(compiler + ['-fopenmp', filename],
                                         stdout=fnull, stderr=fnull)
 
         # Clean up


https://bitbucket.org/yt_analysis/yt/commits/092c46b49e48/
Changeset:   092c46b49e48
Branch:      yt
User:        xarthisius
Date:        2015-10-05 18:16:11+00:00
Summary:     Merged in atmyers/yt (pull request #1768)

Improve check_for_openmp()
Affected #:  1 file

diff -r cd2ee9b98823a3b88e0242bfdb871655e0896a0b -r 092c46b49e487ccad91a0ef709bd94700c6d8969 yt/utilities/lib/setup.py
--- a/yt/utilities/lib/setup.py
+++ b/yt/utilities/lib/setup.py
@@ -17,6 +17,7 @@
 
         # Get compiler invocation
         compiler = os.getenv('CC', 'cc')
+        compiler = compiler.split(' ')
 
         # Attempt to compile a test script.
         # See http://openmp.org/wp/openmp-compilers/
@@ -32,11 +33,13 @@
             )
         file.flush()
         with open(os.devnull, 'w') as fnull:
-            exit_code = subprocess.call([compiler, '-fopenmp', filename],
+            exit_code = subprocess.call(compiler + ['-fopenmp', filename],
                                         stdout=fnull, stderr=fnull)
 
         # Clean up
         file.close()
+    except OSError:
+        return False
     finally:
         os.chdir(curdir)
         shutil.rmtree(tmpdir)

Repository URL: https://bitbucket.org/yt_analysis/yt/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.



More information about the yt-svn mailing list