You should be able to just cherry-pick the commits from Barry's branch
as well as the two other branches.
On 8/2/19 8:13 PM, Mark Adams wrote:
I picked these two into Barry's branch and it built.
I would like to get them into my cuda branch. Should I just pick them?
And not worry about Barry's branch. Or will that not work.
On Fri, Aug 2, 2019 at 12:03 PM Karl Rupp <[email protected]
<mailto:[email protected]>> wrote:
FYI: The two branches are currently testing in `next-tmp` and are
likely
to be merged to master in ~5 hours.
Best regards,
Karli
On 8/2/19 4:53 PM, Smith, Barry F. via petsc-dev wrote:
>
> Yes, these are bugs in Stefano's work that got into master
because we didn't have comprehensive testing. There are two branches
in the PR list you can cherry pick that will fix this problem. Sorry
about this. We're trying to get them into master as quickly as
possible but ....
>
> Barry
>
>
>> On Aug 2, 2019, at 8:39 AM, Mark Adams <[email protected]
<mailto:[email protected]>> wrote:
>>
>> closer,
>>
>> On Fri, Aug 2, 2019 at 9:13 AM Smith, Barry F.
<[email protected] <mailto:[email protected]>> wrote:
>>
>> Mark,
>>
>> Thanks, that was not expected to work, I was just verifying
the exact cause of the problem and it was what I was guessing.
>>
>> I believe I have fixed it. Please pull that branch again
and let me know if it works. If it does we'll do rush testing and
get it into master.
>>
>> Thanks
>>
>> Barry
>>
>>
>>> On Aug 1, 2019, at 11:08 AM, Mark Adams <[email protected]
<mailto:[email protected]>> wrote:
>>>
>>>
>>>
>>> On Thu, Aug 1, 2019 at 10:30 AM Smith, Barry F.
<[email protected] <mailto:[email protected]>> wrote:
>>>
>>> Send
>>>
>>> ls arch-linux2-c-debug/include/
>>>
>>> That is not my arch name. It is something like
arch-summit-dbg64-pgi-cuda
>>>
>>> arch-linux2-c-debug/include/petscpkg_version.h
>>>
>>> and configure.log
>>>
>>>
>>>
>>>> On Aug 1, 2019, at 5:23 AM, Mark Adams <[email protected]
<mailto:[email protected]>> wrote:
>>>>
>>>> I get the same error with a fresh clone of master.
>>>>
>>>> On Thu, Aug 1, 2019 at 6:03 AM Mark Adams <[email protected]
<mailto:[email protected]>> wrote:
>>>> Tried again after deleting the arch dirs and still have it.
>>>> This is my branch that just merged master. I will try with
just master.
>>>> Thanks,
>>>>
>>>> On Thu, Aug 1, 2019 at 1:36 AM Smith, Barry F.
<[email protected] <mailto:[email protected]>> wrote:
>>>>
>>>> It is generated automatically and put in
arch-linux2-c-debug/include/petscpkg_version.h this include file is
included at top of the "bad" source file crashes so in theory
everything is in order check that
arch-linux2-c-debug/include/petscpkg_version.h contains
PETSC_PKG_CUDA_VERSION_GE and similar macros. If not send configure.lo
>>>>
>>>> check what is in
arch-linux2-c-debug/include/petscpkg_version.h it nothing or broken
send configure.lo
>>>>
>>>>
>>>> Barry
>>>>
>>>>
>>>>
>>>>> On Jul 31, 2019, at 9:28 PM, Mark Adams via petsc-dev
<[email protected] <mailto:[email protected]>> wrote:
>>>>>
>>>>> I am seeing this when I pull master into my branch:
>>>>>
>>>>>
"/autofs/nccs-svm1_home1/adams/petsc/src/mat/impls/dense/seq/cuda/densecuda.cu
<http://densecuda.cu>"
>>>>> , line 243: error: function call is not allowed in
a constant
>>>>> expression
>>>>> #if PETSC_PKG_CUDA_VERSION_GE(10,1,0)
>>>>>
>>>>> and I see that this macro does not seem to be defined:
>>>>>
>>>>> 22:24 master= ~/Codes/petsc$ git grep PETSC_PKG_CUDA_VERSION_GE
>>>>> src/mat/impls/dense/seq/cuda/densecuda.cu:#if
PETSC_PKG_CUDA_VERSION_GE(10,1,0)
>>>>
>>>
>>
>> <make.log><configure.log>
>
